UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 09:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
badlogic 2019-05-02 11:38:47 +02:00
commit 67f469b06d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs
View File

@ -80,9 +80,13 @@ 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);
#endif #endif