[c] Fixed deform timelines not mixing from/to setup pose. #920

This commit is contained in:
badlogic 2017-06-04 11:05:07 +02:00
parent 2b5058f020
commit 63459d8531
13 changed files with 42915 additions and 42915 deletions

View File

@ -806,7 +806,7 @@ void _spDeformTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton,
slot->attachmentVerticesCapacity = vertexCount;
}
}
if (slot->attachmentVerticesCount != vertexCount) alpha = 1; /* Don't mix from uninitialized slot vertices. */
if (slot->attachmentVerticesCount != vertexCount && !setupPose) alpha = 1; /* Don't mix from uninitialized slot vertices. */
slot->attachmentVerticesCount = vertexCount;
frameVertices = self->frameVertices;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -603,7 +603,7 @@ var spine;
}
var frameVertices = this.frameVertices;
var vertexCount = frameVertices[0].length;
if (verticesArray.length != vertexCount)
if (verticesArray.length != vertexCount && !setupPose)
alpha = 1;
var vertices = spine.Utils.setArraySize(verticesArray, vertexCount);
if (time >= frames[frames.length - 1]) {

File diff suppressed because one or more lines are too long