UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-11 17:48:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed resetTrack when a default mix time is used.

Browse Source
This commit is contained in:
NathanSweet 2016-08-23 17:38:37 +02:00
parent bc05861a0c
commit fd81d31278
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,6 +293,7 @@ public class AnimationState {
private void resetTrack (TrackEntry current) {
TrackEntry entry = trackEntry(current.trackIndex, emptyAnimation, false, current);
entry.mixDuration = 0;
current.trackTime = 0;
setCurrent(current.trackIndex, entry);
}
@ -394,6 +395,7 @@ public class AnimationState {
* after {@link AnimationStateListener#end(TrackEntry)}. */
public TrackEntry setAnimation (int trackIndex, Animation animation, boolean loop) {
if (animation == null) throw new IllegalArgumentException("animation cannot be null.");
// if (animation == null) animation = emptyAnimation; // BOZO - Test.
TrackEntry current = expandToIndex(trackIndex);
if (current != null) {
if (current.nextTrackLast == -1) {