GltfRecorder color spaces

KhronosGroup · Sep 8, 2023 · 0c61ee5 · 0c61ee5
1 parent 906bb09
commit 0c61ee5
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Runtime/Scripts/Timeline/GLTFRecorder.cs b/Runtime/Scripts/Timeline/GLTFRecorder.cs
@@ -134,8 +134,9 @@ public AnimationData(Transform tr, double time, bool zeroScale = false, bool rec
 							{
 								r.GetPropertyBlock(materialPropertyBlock);
 	#if UNITY_2021_1_OR_NEWER
-								if (materialPropertyBlock.HasColor("_BaseColor")) return materialPropertyBlock.GetColor("_BaseColor");
-								if (materialPropertyBlock.HasColor("_Color")) return materialPropertyBlock.GetColor("_Color");
+								if (materialPropertyBlock.HasColor("_BaseColor")) return materialPropertyBlock.GetColor("_BaseColor").linear;
+								if (materialPropertyBlock.HasColor("_Color")) return materialPropertyBlock.GetColor("_Color").linear;
+								if (materialPropertyBlock.HasColor("baseColorFactor")) return materialPropertyBlock.GetColor("baseColorFactor").linear;
 	#else
 								var c = materialPropertyBlock.GetColor("_BaseColor");
 								if (c.r != 0 || c.g != 0 || c.b != 0 || c.a != 0) return c;
@@ -148,8 +149,9 @@ public AnimationData(Transform tr, double time, bool zeroScale = false, bool rec
 
 							if (mat is Material m && m)
 							{
-								if (m.HasProperty("_BaseColor")) return m.GetColor("_BaseColor");
-								if (m.HasProperty("_Color")) return m.GetColor("_Color");
+								if (m.HasProperty("_BaseColor")) return m.GetColor("_BaseColor").linear;
+								if (m.HasProperty("_Color")) return m.GetColor("_Color").linear;
+								if (m.HasProperty("baseColorFactor")) return m.GetColor("baseColorFactor").linear;
 							}
 
 							return null;