Merge branch 'EsotericSoftware/3.6' into 3.6

This commit is contained in:
Stephen Gowen 2017-11-20 11:50:50 -05:00
commit cfcc548b5f

View File

@ -80,14 +80,16 @@ namespace Spine.Unity {
} }
// Only provide visual feedback to inspector changes in Unity Editor Edit mode.
if (!Application.isPlaying) { if (!Application.isPlaying) {
skeleton.flipX = this.initialFlipX; skeleton.flipX = this.initialFlipX;
skeleton.flipY = this.initialFlipY; skeleton.flipY = this.initialFlipY;
skeleton.SetToSetupPose();
if (!string.IsNullOrEmpty(startingAnimation))
skeleton.PoseWithAnimation(startingAnimation, 0f, false);
} }
skeleton.SetToSetupPose();
if (!string.IsNullOrEmpty(startingAnimation))
skeleton.PoseWithAnimation(startingAnimation, 0f, false);
} }
} else { } else {
if (skeletonDataAsset != null) if (skeletonDataAsset != null)