瀏覽代碼

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

badlogic 8 年之前
父節點
當前提交
ed2594deca
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      spine-csharp/src/AnimationState.cs

+ 3 - 2
spine-csharp/src/AnimationState.cs

@@ -220,9 +220,10 @@ namespace Spine {
 			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;
 			}