mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-15 19:41:36 +08:00
Merge branch '4.0' into 4.1-beta
This commit is contained in:
commit
6bf8de327c
@ -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") &&
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user