UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-09 12:16:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Never prefer empty animation when interrupting a mix.

Browse Source
This commit is contained in:
NathanSweet 2016-08-24 22:27:02 +02:00
parent a840f4f959
commit 81d7c1daeb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,7 +274,8 @@ public class AnimationState {
queue.interrupt(current); queue.interrupt(current);
// If a mix is in progress, mix from the closest animation. // If a mix is in progress, mix from the closest animation.
if (mixingFrom != null && (current.mixDuration == 0 || current.mixTime / current.mixDuration < 0.5f)) { if (mixingFrom != null && mixingFrom.animation != emptyAnimation
&& (current.mixDuration == 0 || current.mixTime / current.mixDuration < 0.5f)) {
entry.mixingFrom = mixingFrom; entry.mixingFrom = mixingFrom;
mixingFrom = current; mixingFrom = current;
} else } else