Browse Source

[unity] Added null-check at AnimationReferenceAsset.

Harald Csaszar 4 years ago
parent
commit
d6df0725a2

+ 2 - 1
spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/AnimationReferenceAsset.cs

@@ -55,7 +55,8 @@ namespace Spine.Unity {
 
 
 		public void Initialize () {
 		public void Initialize () {
 			if (skeletonDataAsset == null) return;
 			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);
 			if (this.animation == null) Debug.LogWarningFormat("Animation '{0}' not found in SkeletonData : {1}.", animationName, skeletonDataAsset.name);
 		}
 		}