UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' into 3.7-beta

Browse Source
This commit is contained in:
NathanSweet 2017-06-24 18:34:49 +02:00
commit 447cce2f84
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -610,13 +610,9 @@ public class AnimationState {
propertyIDs.clear(); propertyIDs.clear();
Array<TrackEntry> mixingTo = this.mixingTo; Array<TrackEntry> mixingTo = this.mixingTo;
TrackEntry lastEntry = null;
for (int i = 0, n = tracks.size; i < n; i++) { for (int i = 0, n = tracks.size; i < n; i++) {
TrackEntry entry = tracks.get(i); TrackEntry entry = tracks.get(i);
if (entry != null) { if (entry != null) entry.setTimelineData(null, mixingTo, propertyIDs);
entry.setTimelineData(lastEntry, mixingTo, propertyIDs);
lastEntry = entry;
}
} }
} }