Merge branch '3.6' into 3.7-beta

This commit is contained in:
NathanSweet 2017-06-24 18:34:49 +02:00
commit 447cce2f84

View File

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