From 5e563c883d2571dbdd27b4ea0c62e8b28eedf964 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 6 Jan 2018 21:30:37 +0800 Subject: [PATCH] [unity] Include Unity 5.6 for clipInfoCache API usage. --- spine-unity/Assets/spine-unity/SkeletonAnimator.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spine-unity/Assets/spine-unity/SkeletonAnimator.cs b/spine-unity/Assets/spine-unity/SkeletonAnimator.cs index dfe76db59..c9d0c4da6 100644 --- a/spine-unity/Assets/spine-unity/SkeletonAnimator.cs +++ b/spine-unity/Assets/spine-unity/SkeletonAnimator.cs @@ -28,7 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -// Contributed by: Mitch Thompson +#if UNITY_5_6_OR_NEWER +#define UNITY_CLIPINFOCACHE +#endif using UnityEngine; using System.Collections.Generic; @@ -116,7 +118,7 @@ namespace Spine.Unity { readonly Dictionary animationTable = new Dictionary(IntEqualityComparer.Instance); readonly Dictionary clipNameHashCodeTable = new Dictionary(AnimationClipEqualityComparer.Instance); readonly List previousAnimations = new List(); - #if UNITY_2017_1_OR_NEWER + #if UNITY_CLIPINFOCACHE readonly List clipInfoCache = new List(); readonly List nextClipInfoCache = new List(); #endif @@ -135,7 +137,7 @@ namespace Spine.Unity { animationTable.Add(a.Name.GetHashCode(), a); clipNameHashCodeTable.Clear(); - #if UNITY_2017_1_OR_NEWER + #if UNITY_CLIPINFOCACHE clipInfoCache.Clear(); nextClipInfoCache.Clear(); #endif @@ -263,7 +265,7 @@ namespace Spine.Unity { out int nextClipInfoCount, out IList clipInfo, out IList nextClipInfo) { - #if UNITY_2017_1_OR_NEWER + #if UNITY_CLIPINFOCACHE clipInfoCount = animator.GetCurrentAnimatorClipInfoCount(layer); nextClipInfoCount = animator.GetNextAnimatorClipInfoCount(layer); if (clipInfoCache.Capacity < clipInfoCount) clipInfoCache.Capacity = clipInfoCount;