From 8476b55fee11ab3540b33fa32cbe571f05989537 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Fri, 14 Aug 2020 17:47:15 +0200 Subject: [PATCH] [unity] Enabled CanvasGroup support by default for all SkeletonGraphic shaders on 4.0 branch. See commit 9d46a0c8bf. See #1576. --- .../Runtime/spine-unity/Materials/SkeletonGraphicDefault.mat | 1 + .../spine-unity/Materials/SkeletonGraphicDefaultOutline.mat | 1 + .../Runtime/spine-unity/Materials/SkeletonGraphicTintBlack.mat | 1 + .../spine-unity/Materials/SkeletonGraphicTintBlackOutline.mat | 1 + .../SkeletonGraphic/Spine-SkeletonGraphic-Outline.shader | 2 +- .../Spine-SkeletonGraphic-TintBlack-Outline.shader | 2 +- .../SkeletonGraphic/Spine-SkeletonGraphic-TintBlack.shader | 2 +- .../Shaders/SkeletonGraphic/Spine-SkeletonGraphic.shader | 2 +- 8 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefault.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefault.mat index 08d7764ce..0cb013afc 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefault.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefault.mat @@ -61,6 +61,7 @@ Material: m_Floats: - PixelSnap: 0 - _BumpScale: 1 + - _CanvasGroupCompatible: 1 - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefaultOutline.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefaultOutline.mat index 7082bbf64..fd4bcc315 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefaultOutline.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicDefaultOutline.mat @@ -61,6 +61,7 @@ Material: m_Floats: - PixelSnap: 0 - _BumpScale: 1 + - _CanvasGroupCompatible: 1 - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlack.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlack.mat index d78d41528..405a0ecc2 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlack.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlack.mat @@ -55,6 +55,7 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _CanvasGroupCompatible: 1 - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlackOutline.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlackOutline.mat index 30d42c7f6..eb44eb89e 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlackOutline.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphicTintBlackOutline.mat @@ -56,6 +56,7 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _CanvasGroupCompatible: 1 - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/SkeletonGraphic/Spine-SkeletonGraphic-Outline.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/SkeletonGraphic/Spine-SkeletonGraphic-Outline.shader index 05f279ea5..c3c82a631 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/SkeletonGraphic/Spine-SkeletonGraphic-Outline.shader +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/SkeletonGraphic/Spine-SkeletonGraphic-Outline.shader @@ -6,7 +6,7 @@ Shader "Spine/Outline/SkeletonGraphic" { [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} [Toggle(_STRAIGHT_ALPHA_INPUT)] _StraightAlphaInput("Straight Alpha Texture", Int) = 0 - [Toggle(_CANVAS_GROUP_COMPATIBLE)] _CanvasGroupCompatible("CanvasGroup Compatible", Int) = 0 + [Toggle(_CANVAS_GROUP_COMPATIBLE)] _CanvasGroupCompatible("CanvasGroup Compatible", Int) = 1 _Color ("Tint", Color) = (1,1,1,1) [HideInInspector][Enum(UnityEngine.Rendering.CompareFunction)] _StencilComp ("Stencil Comparison", Float) = 8 diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack-Outline.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack-Outline.shader index f739f1145..7c1892d90 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack-Outline.shader +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Outline/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack-Outline.shader @@ -6,7 +6,7 @@ Shader "Spine/Outline/SkeletonGraphic Tint Black" { [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} [Toggle(_STRAIGHT_ALPHA_INPUT)] _StraightAlphaInput("Straight Alpha Texture", Int) = 0 - [Toggle(_CANVAS_GROUP_COMPATIBLE)] _CanvasGroupCompatible("CanvasGroup Compatible", Int) = 0 + [Toggle(_CANVAS_GROUP_COMPATIBLE)] _CanvasGroupCompatible("CanvasGroup Compatible", Int) = 1 _Color ("Tint", Color) = (1,1,1,1) _Black ("Black Point", Color) = (0,0,0,0) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack.shader index 0e731a730..028e8735f 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack.shader +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic-TintBlack.shader @@ -6,7 +6,7 @@ Shader "Spine/SkeletonGraphic Tint Black" { [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} [Toggle(_STRAIGHT_ALPHA_INPUT)] _StraightAlphaInput("Straight Alpha Texture", Int) = 0 - [Toggle(_CANVAS_GROUP_COMPATIBLE)] _CanvasGroupCompatible("CanvasGroup Compatible", Int) = 0 + [Toggle(_CANVAS_GROUP_COMPATIBLE)] _CanvasGroupCompatible("CanvasGroup Compatible", Int) = 1 _Color ("Tint", Color) = (1,1,1,1) _Black ("Black Point", Color) = (0,0,0,0) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic.shader index d01657b0c..1e8f0fa6f 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic.shader +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/SkeletonGraphic/Spine-SkeletonGraphic.shader @@ -6,7 +6,7 @@ Shader "Spine/SkeletonGraphic" { [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} [Toggle(_STRAIGHT_ALPHA_INPUT)] _StraightAlphaInput("Straight Alpha Texture", Int) = 0 - [Toggle(_CANVAS_GROUP_COMPATIBLE)] _CanvasGroupCompatible("CanvasGroup Compatible", Int) = 0 + [Toggle(_CANVAS_GROUP_COMPATIBLE)] _CanvasGroupCompatible("CanvasGroup Compatible", Int) = 1 _Color ("Tint", Color) = (1,1,1,1) [HideInInspector][Enum(UnityEngine.Rendering.CompareFunction)] _StencilComp ("Stencil Comparison", Float) = 8