From 37cc09537577cf6cbfa21cb5ee25231a4b2c2c39 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Thu, 21 Feb 2019 19:10:14 +0100 Subject: [PATCH] [unity] SkeletonGraphic now supports Unity RectMask2D. Closes #1283. --- .../Shaders/Spine-SkeletonGraphic-TintBlack.shader | 2 +- .../SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader index 14d0eda28..f31d0a20e 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic-TintBlack.shader @@ -111,7 +111,7 @@ Shader "Spine/SkeletonGraphic Tint Black" texColor.rgb *= texColor.a; #endif - texColor.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); + texColor *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); #ifdef UNITY_UI_ALPHACLIP clip (texColor.a - 0.001); diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader index 87ede06cd..c570c6585 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/SkeletonGraphic/Shaders/Spine-SkeletonGraphic.shader @@ -109,7 +109,7 @@ Shader "Spine/SkeletonGraphic" half4 color = (texColor + _TextureSampleAdd) * IN.color; - color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); + color *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); #ifdef UNITY_UI_ALPHACLIP clip (color.a - 0.001);