diff --git a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs index 3f80d3efc..4febc2693 100644 --- a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs +++ b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs @@ -108,6 +108,7 @@ namespace Spine.Unity.Editor { var skeletonGraphic = (SkeletonGraphic)command.context; var mesh = skeletonGraphic.SpineMeshGenerator.LastGeneratedMesh; + mesh.RecalculateBounds(); var bounds = mesh.bounds; var size = bounds.size; var center = bounds.center; @@ -120,19 +121,6 @@ namespace Spine.Unity.Editor { skeletonGraphic.rectTransform.pivot = p; } - public static Material DefaultSkeletonGraphicMaterial { - get { - var guids = AssetDatabase.FindAssets("SkeletonGraphicDefault t:material"); - if (guids.Length <= 0) - return null; - var firstAssetPath = AssetDatabase.GUIDToAssetPath(guids[0]); - if (string.IsNullOrEmpty(firstAssetPath)) - return null; - var firstMaterial = AssetDatabase.LoadAssetAtPath(firstAssetPath); - return firstMaterial; - } - } - [MenuItem("GameObject/Spine/SkeletonGraphic (UnityUI)", false, 15)] static public void SkeletonGraphicCreateMenuItem () { var parentGameObject = Selection.activeObject as GameObject; @@ -219,6 +207,19 @@ namespace Spine.Unity.Editor { return go; } + public static Material DefaultSkeletonGraphicMaterial { + get { + var guids = AssetDatabase.FindAssets("SkeletonGraphicDefault t:material"); + if (guids.Length <= 0) return null; + + var firstAssetPath = AssetDatabase.GUIDToAssetPath(guids[0]); + if (string.IsNullOrEmpty(firstAssetPath)) return null; + + var firstMaterial = AssetDatabase.LoadAssetAtPath(firstAssetPath); + return firstMaterial; + } + } + #endregion #endif diff --git a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphic.shader b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphic.shader index c58b7ef71..3f9877915 100644 --- a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphic.shader +++ b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Shaders/SkeletonGraphic.shader @@ -1,3 +1,5 @@ +// This is a premultiply-alpha adaptation of the built-in Unity shader "UI/Default" to allow Unity UI stencil masking. + Shader "Spine/SkeletonGraphic (Premultiply Alpha)" { Properties @@ -84,7 +86,7 @@ Shader "Spine/SkeletonGraphic (Premultiply Alpha)" fixed4 frag(v2f IN) : SV_Target { half4 color = tex2D(_MainTex, IN.texcoord) * IN.color; - clip (color.a - 0.01); + //clip(color.a - 0.01); return color; } ENDCG