From 3025b370f5aac9aa4b4f518373fca96db4f87bba Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Thu, 9 Dec 2021 18:56:26 +0100 Subject: [PATCH] [Unity] Fixed MaterialChecks to correctly check for Sprite material settings. Closes pull request #2000. --- .../Runtime/spine-unity/Utility/MaterialChecks.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/MaterialChecks.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/MaterialChecks.cs index 316080bc0..dbf67333f 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/MaterialChecks.cs +++ b/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") &&