diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-SkeletonLit-URP-2D.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-SkeletonLit-URP-2D.shader index b1f36cef0..2d59239bf 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-SkeletonLit-URP-2D.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-SkeletonLit-URP-2D.shader @@ -141,18 +141,18 @@ Shader "Universal Render Pipeline/2D/Spine/Skeleton Lit" { // un-premultiply for additive lights in CombinedShapeLightShared, reapply afterwards main.rgb = main.a == 0 ? main.rgb : main.rgb / main.a; #else + #if !defined(_LIGHT_AFFECTS_ADDITIVE) + if (i.color.a == 0) { + return tex * i.color; // unlit additive, directly return PMA color + } + #endif + #if !defined(_STRAIGHT_ALPHA_INPUT) // un-premultiply for additive lights in CombinedShapeLightShared, reapply afterwards tex.rgb = tex.a == 0 ? tex.rgb : tex.rgb / tex.a; #endif half4 main = tex * i.color; - - #if !defined(_LIGHT_AFFECTS_ADDITIVE) - if (i.color.a == 0) - return half4(main.rgb * main.a, main.a); - #endif #endif - half4 mask = SAMPLE_TEXTURE2D(_MaskTex, sampler_MaskTex, i.uv); #if UNITY_VERSION < 202120 return half4(CombinedShapeLightShared(half4(main.rgb, 1), mask, i.lightingUV).rgb * main.a, main.a); diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json index b966ed38b..d990cdab3 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.urp-shaders", "displayName": "Spine Universal RP Shaders", "description": "This plugin provides universal render pipeline (URP) shaders for the spine-unity runtime.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 4.2.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.2.31", + "version": "4.2.32", "unity": "2019.3", "author": { "name": "Esoteric Software",