diff --git a/spine-as3/spine-as3-example/lib/spine-as3.swc b/spine-as3/spine-as3-example/lib/spine-as3.swc index ff7f8b358..3ab2c8e39 100644 Binary files a/spine-as3/spine-as3-example/lib/spine-as3.swc and b/spine-as3/spine-as3-example/lib/spine-as3.swc differ diff --git a/spine-as3/spine-as3/src/spine/animation/TrackEntry.as b/spine-as3/spine-as3/src/spine/animation/TrackEntry.as index b26ee29f8..aa6eb3661 100644 --- a/spine-as3/spine-as3/src/spine/animation/TrackEntry.as +++ b/spine-as3/spine-as3/src/spine/animation/TrackEntry.as @@ -46,7 +46,7 @@ package spine.animation { public var eventThreshold : Number, attachmentThreshold : Number, drawOrderThreshold : Number; public var animationStart : Number, animationEnd : Number, animationLast : Number, nextAnimationLast : Number; public var delay : Number, trackTime : Number, trackLast : Number, nextTrackLast : Number, trackEnd : Number, timeScale : Number; - public var alpha : Number, mixTime : Number, mixDuration : Number, interruptAlpha : Number, totalAlpha : Number; + public var alpha : Number, mixTime : Number, mixDuration : Number, interruptAlpha : Number, totalAlpha : Number = 0; public var timelineData : Vector. = new Vector.(); public var timelineDipMix : Vector. = new Vector.(); public var timelinesRotation : Vector. = new Vector.(); @@ -97,12 +97,13 @@ package spine.animation { for (var i : int = 0; i < timelinesCount; i++) { var intId : int = timelines[i].getPropertyId(); var id : String = intId.toString(); - if (!(propertyIDs[id] == false)) { - propertyIDs[id] = true; + var contained: Object = propertyIDs[id]; + propertyIDs[id] = true; + if (contained != undefined) { timelineData[i] = AnimationState.SUBSEQUENT; - } else if (to == null || !to.hasTimeline(intId)) + } else if (to == null || !to.hasTimeline(intId)) { timelineData[i] = AnimationState.FIRST; - else { + } else { for (var ii : int = mixingToLast; ii >= 0; ii--) { var entry : TrackEntry = mixingTo[ii]; if (!entry.hasTimeline(intId)) { diff --git a/spine-starling/spine-starling-example/lib/spine-as3.swc b/spine-starling/spine-starling-example/lib/spine-as3.swc index ff7f8b358..64fb0f628 100644 Binary files a/spine-starling/spine-starling-example/lib/spine-as3.swc and b/spine-starling/spine-starling-example/lib/spine-as3.swc differ diff --git a/spine-starling/spine-starling/lib/spine-as3.swc b/spine-starling/spine-starling/lib/spine-as3.swc index ff7f8b358..64fb0f628 100644 Binary files a/spine-starling/spine-starling/lib/spine-as3.swc and b/spine-starling/spine-starling/lib/spine-as3.swc differ