浏览代码

Fix not returning to setup pose when multiple mixing from entries end at same time

#1024
Nathan Sweet 8 年之前
父节点
当前提交
882f49f5a9
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

+ 3 - 2
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

@@ -244,9 +244,10 @@ public class AnimationState {
 		if (from.mixingFrom != null) applyMixingFrom(from, skeleton, currentPose);
 
 		float mix;
-		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;
 		}