From 638e176f595ba8786f223f19a06ef4f90b78d5bc Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 19 Feb 2019 19:54:59 +0100 Subject: [PATCH] [unity] Corrected #if guards for Unity 5.x compatibility before Unity added SpriteMasks. See #941. --- .../Editor/spine-unity/Editor/SkeletonRendererInspector.cs | 2 +- .../Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs | 2 +- .../Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonRendererInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonRendererInspector.cs index 66ae5331a..f43307360 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonRendererInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonRendererInspector.cs @@ -34,7 +34,7 @@ #define NO_PREFAB_MESH #endif -#if UNITY_2017_OR_NEWER +#if UNITY_2017_1_OR_NEWER #define BUILT_IN_SPRITE_MASK_COMPONENT #endif diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs index 4b1e3e8cc..0986fedf8 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs @@ -44,7 +44,7 @@ #define NEWHIERARCHYWINDOWCALLBACKS #endif -#if UNITY_2017_OR_NEWER +#if UNITY_2017_1_OR_NEWER #define BUILT_IN_SPRITE_MASK_COMPONENT #endif diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs index 85108f899..46db07887 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs @@ -32,7 +32,7 @@ #define NEW_PREFAB_SYSTEM #endif -#if UNITY_2017_OR_NEWER +#if UNITY_2017_1_OR_NEWER #define BUILT_IN_SPRITE_MASK_COMPONENT #endif