From d6df0725a2594d94d893bf6e9c37396a520fd34a Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 31 Aug 2021 17:03:20 +0200 Subject: [PATCH] [unity] Added null-check at AnimationReferenceAsset. --- .../Runtime/spine-unity/Asset Types/AnimationReferenceAsset.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/AnimationReferenceAsset.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/AnimationReferenceAsset.cs index d5dd0d851d..f84152e301 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/AnimationReferenceAsset.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/AnimationReferenceAsset.cs @@ -55,7 +55,8 @@ public class AnimationReferenceAsset : ScriptableObject, IHasSkeletonDataAsset { public void Initialize () { if (skeletonDataAsset == null) return; - this.animation = skeletonDataAsset.GetSkeletonData(AnimationReferenceAsset.QuietSkeletonData).FindAnimation(animationName); + SkeletonData skeletonData = skeletonDataAsset.GetSkeletonData(AnimationReferenceAsset.QuietSkeletonData); + this.animation = skeletonData != null ? skeletonData.FindAnimation(animationName) : null; if (this.animation == null) Debug.LogWarningFormat("Animation '{0}' not found in SkeletonData : {1}.", animationName, skeletonDataAsset.name); }