Don't clear FFD if before first FFD key in animation.

Didn't make any sense. Any existing FFD should remain until time passes a key.
mrsaleh · Nov 15, 2014 · ee1f13a · ee1f13a
1 parent 31848ad
commit ee1f13a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/spine-as3/spine-as3/src/spine/animation/FfdTimeline.as b/spine-as3/spine-as3/src/spine/animation/FfdTimeline.as
@@ -57,10 +57,7 @@ public class FfdTimeline extends CurveTimeline {
 		if (slot.attachment != attachment) return;
 
 		var frames:Vector.<Number> = this.frames;
-		if (time < frames[0]) {
-			slot.attachmentVertices.length = 0;
-			return; // Time is before first frame.
-		}
+		if (time < frames[0]) return; // Time is before first frame.
 
 		var frameVertices:Vector.<Vector.<Number>> = this.frameVertices;
 		var vertexCount:int = frameVertices[0].length;

diff --git a/spine-c/src/spine/Animation.c b/spine-c/src/spine/Animation.c
@@ -659,10 +659,7 @@ void _spFFDTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, flo
 	spSlot *slot = skeleton->slots[self->slotIndex];
 	if (slot->attachment != self->attachment) return;
 
-	if (time < self->frames[0]) {
-		slot->attachmentVerticesCount = 0;
-		return; /* Time is before first frame. */
-	}
+	if (time < self->frames[0]) return; /* Time is before first frame. */
 
 	if (slot->attachmentVerticesCount < self->frameVerticesCount) {
 		if (slot->attachmentVerticesCapacity < self->frameVerticesCount) {

diff --git a/spine-csharp/src/Animation.cs b/spine-csharp/src/Animation.cs
@@ -571,10 +571,7 @@ override public void Apply (Skeleton skeleton, float lastTime, float time, List<
 			if (slot.attachment != attachment) return;
 
 			float[] frames = this.frames;
-			if (time < frames[0]) {
-				slot.attachmentVerticesCount = 0;
-				return; // Time is before first frame.
-			}
+			if (time < frames[0]) return; // Time is before first frame.
 
 			float[][] frameVertices = this.frameVertices;
 			int vertexCount = frameVertices[0].Length;

diff --git a/spine-js/spine.js b/spine-js/spine.js
@@ -774,10 +774,7 @@ spine.FfdTimeline.prototype = {
 		if (slot.attachment != attachment) return;
 
 		var frames = this.frames;
-		if (time < frames[0]) {
-			slot.attachmentVertices.length = 0;
-			return; // Time is before first frame.
-		}
+		if (time < frames[0]) return; // Time is before first frame.
 
 		var frameVertices = this.frameVertices;
 		var vertexCount = frameVertices[0].length;