Parcourir la source

Merge branch '4.0' into 4.1-beta

Harald Csaszar il y a 3 ans
Parent
commit
6bf8de327c

+ 9 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Utility/MaterialChecks.cs

@@ -293,11 +293,11 @@ namespace Spine.Unity {
 					break;
 				}
 			}
-			bool isShaderWithMeshNormals = IsSpriteShader(material);
+			bool isShaderWithMeshNormals = IsLitSpriteShader(material);
 			return isShaderWithMeshNormals && !anyFixedNormalSet;
 		}
 
-		static bool IsSpriteShader (Material material) {
+		static bool IsLitSpriteShader (Material material) {
 			string shaderName = material.shader.name;
 			return shaderName.Contains("Spine/Sprite/Pixel Lit") ||
 				shaderName.Contains("Spine/Sprite/Vertex Lit") ||
@@ -305,6 +305,13 @@ namespace Spine.Unity {
 				shaderName.Contains("Pipeline/Spine/Sprite"); // covers both URP and LWRP
 		}
 
+		static bool IsSpriteShader (Material material) {
+			if (IsLitSpriteShader(material))
+				return true;
+			string shaderName = material.shader.name;
+			return shaderName.Contains("Spine/Sprite/Unlit");
+		}
+
 		static bool RequiresTintBlack (Material material) {
 			bool isTintBlackShader =
 				material.shader.name.Contains("Spine") &&