Переглянути джерело

Merge branch '3.7' of https://github.com/esotericsoftware/spine-runtimes into 3.7

badlogic 6 роки тому
батько
коміт
67f469b06d

+ 5 - 1
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs

@@ -80,8 +80,12 @@ namespace Spine.Unity {
 			if (Application.isPlaying) {
 			if (Application.isPlaying) {
 				translator.Apply(skeleton);
 				translator.Apply(skeleton);
 			} else {
 			} else {
-				if (translatorAnimator != null && translatorAnimator.isInitialized)
+				if (translatorAnimator != null && translatorAnimator.isInitialized &&
+					translatorAnimator.isActiveAndEnabled && translatorAnimator.runtimeAnimatorController != null) {
+					// Note: Rebind is required to prevent warning "Animator is not playing an AnimatorController" with prefabs
+					translatorAnimator.Rebind();
 					translator.Apply(skeleton);
 					translator.Apply(skeleton);
+				}
 			}
 			}
 			#else
 			#else
 			translator.Apply(skeleton);
 			translator.Apply(skeleton);