Merge branch 'EsotericSoftware/3.6' into 3.6

This commit is contained in:
Stephen Gowen 2017-11-23 13:00:21 -05:00
commit b50496fe05

View File

@ -76,8 +76,13 @@ namespace Spine.Unity {
if (!valid) return;
#if UNITY_EDITOR
if (Application.isPlaying)
if (Application.isPlaying) {
translator.Apply(skeleton);
} else {
var translatorAnimator = translator.Animator;
if (translatorAnimator != null && translatorAnimator.isInitialized)
translator.Apply(skeleton);
}
#else
translator.Apply(skeleton);
#endif