UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
#1024
This commit is contained in:
Nathan Sweet 2017-10-28 00:20:33 +02:00
parent 1514b4acbb
commit 882f49f5a9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

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