Set linear export setting before accessing texture exporter settings …

…for unknown textures fixing colorspace for custom unknown shader texture properties
KhronosGroup · Oct 21, 2022 · 0fb8d7f · 0fb8d7f
1 parent faa3e9f
commit 0fb8d7f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/SceneExporter/ExporterTextures.cs b/UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/SceneExporter/ExporterTextures.cs
@@ -509,7 +509,7 @@ private ImageId ExportImageInternalBuffer(UniqueTexture uniqueTexture, string te
 
 			if (!wasAbleToExport)
 		    {
-			    var sRGB = true;
+			    var sRGB = !exportSettings.linear;
 
 #if UNITY_EDITOR
 				if (textureSlot == TextureMapType.Custom_Unknown)
@@ -532,11 +532,10 @@ private ImageId ExportImageInternalBuffer(UniqueTexture uniqueTexture, string te
 				var height = uniqueTexture.GetHeight();
 
 				// TODO we could make sure texture size is power-of-two here
-				var destRenderTexture = RenderTexture.GetTemporary(width, height, 24, RenderTextureFormat.ARGB32, format);
-				GL.sRGBWrite = sRGB;
 
-				if (exportSettings.linear)
-					GL.sRGBWrite = false;
+				var destRenderTexture = RenderTexture.GetTemporary(width, height, 24, RenderTextureFormat.Default, format);
+				var previousSRGBState = GL.sRGBWrite;
+				GL.sRGBWrite = sRGB;
 
 				var shader = GetConversionMaterial(exportSettings);
 				if (shader && shader.HasProperty("_SmoothnessMultiplier"))
@@ -575,7 +574,7 @@ private ImageId ExportImageInternalBuffer(UniqueTexture uniqueTexture, string te
 
 				RenderTexture.ReleaseTemporary(destRenderTexture);
 
-				GL.sRGBWrite = false;
+				GL.sRGBWrite = previousSRGBState;
 				if (Application.isEditor)
 				{
 					UnityEngine.Object.DestroyImmediate(exportTexture);