fix: workaround for _ST issues / bugs in SG 2021.2+

KhronosGroup · Sep 12, 2022 · 6b39fcc · 6b39fcc
1 parent a3d2789
commit 6b39fcc
Show file tree

Hide file tree

Showing 3 changed files with 759 additions and 124 deletions.
diff --git a/UnityGLTF/Assets/UnityGLTF/Editor/Scripts/ShaderGraph/InternalShaderGraph/PBRGraphGUI.cs b/UnityGLTF/Assets/UnityGLTF/Editor/Scripts/ShaderGraph/InternalShaderGraph/PBRGraphGUI.cs
@@ -308,6 +308,12 @@ private void DrawProperties(Material targetMaterial, MaterialProperty[] properti
 			{
 				propertyList.RemoveAll(x => x.name.EndsWith("_ST", StringComparison.Ordinal) || x.name.EndsWith("Rotation", StringComparison.Ordinal));
 			}
+			// want to remove the _ST properties since they are drawn inline already on 2021.2+
+			#if UNITY_2021_2_OR_NEWER
+			{
+				propertyList.RemoveAll(x => x.name.EndsWith("_ST", StringComparison.Ordinal));
+			}
+			#endif
 			if (!targetMaterial.IsKeywordEnabled("_VOLUME_TRANSMISSION_ON"))
 			{
 				propertyList.RemoveAll(x => x.name.StartsWith("thickness", StringComparison.Ordinal) || x.name.StartsWith("attenuation", StringComparison.Ordinal) || x.name.StartsWith("transmission", StringComparison.Ordinal));