Merge pull request #55 from paxtonhare/master

Wong timeline being passed to array in spine code
This commit is contained in:
Nathan Sweet 2013-05-30 04:07:19 -07:00
commit c0ad20caa6

View File

@ -221,7 +221,7 @@ public class SkeletonJson {
for each (var valueMap3:Object in values2) {
timeline3.setFrame(frameIndex3++, valueMap3["time"], valueMap3["name"]);
}
timelines.push(timeline);
timelines.push(timeline3);
duration = Math.max(duration, timeline3.frames[timeline3.frameCount - 1]);
} else