From ed2594deca103ac0af29a579d81221822b118064 Mon Sep 17 00:00:00 2001 From: badlogic Date: Sat, 28 Oct 2017 09:44:21 +0200 Subject: [PATCH] [csharp] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 --- spine-csharp/src/AnimationState.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spine-csharp/src/AnimationState.cs b/spine-csharp/src/AnimationState.cs index 6e2dfb5b4..91157098c 100644 --- a/spine-csharp/src/AnimationState.cs +++ b/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; }