浏览代码

Merge branch '3.6' into 3.7-beta

NathanSweet 8 年之前
父节点
当前提交
447cce2f84
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

+ 1 - 5
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

@@ -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) {
-				entry.setTimelineData(lastEntry, mixingTo, propertyIDs);
-				lastEntry = entry;
-			}
+			if (entry != null) entry.setTimelineData(null, mixingTo, propertyIDs);
 		}
 		}
 	}
 	}