Browse Source

[as3] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027

badlogic 8 years ago
parent
commit
77c990c75e

BIN
spine-as3/spine-as3-example/lib/spine-as3.swc


+ 3 - 2
spine-as3/spine-as3/src/spine/animation/AnimationState.as

@@ -207,9 +207,10 @@ package spine.animation {
 			if (from.mixingFrom != null) applyMixingFrom(from, skeleton, currentPose);
 
 			var mix : Number = 0;
-			if (to.mixDuration == 0) // Single frame mix to undo mixingFrom changes.
+			if (to.mixDuration == 0) { // Single frame mix to undo mixingFrom changes.
 				mix = 1;
-			else {
+				currentPose = MixPose.setup;
+			} else {
 				mix = to.mixTime / to.mixDuration;
 				if (mix > 1) mix = 1;
 			}

BIN
spine-starling/spine-starling-example/lib/spine-as3.swc


BIN
spine-starling/spine-starling/lib/spine-as3.swc