UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6

Browse Source
This commit is contained in:
badlogic 2018-06-28 11:11:54 +02:00
commit 599f99e016
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-as3/spine-as3/src/spine/animation/TrackEntry.as
View File

@ -99,7 +99,7 @@ package spine.animation {
var id : String = intId.toString(); var id : String = intId.toString();
var contained: Object = propertyIDs[id]; var contained: Object = propertyIDs[id];
propertyIDs[id] = true; propertyIDs[id] = true;
if (contained != undefined) { if (contained != null) {
timelineData[i] = AnimationState.SUBSEQUENT; timelineData[i] = AnimationState.SUBSEQUENT;
} else if (to == null || !to.hasTimeline(intId)) { } else if (to == null || !to.hasTimeline(intId)) {
timelineData[i] = AnimationState.FIRST; timelineData[i] = AnimationState.FIRST;