UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/spine-c/src/spine/Animation.c
View File

@ -806,7 +806,7 @@ void _spDeformTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton,
slot->attachmentVerticesCapacity = vertexCount; 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; slot->attachmentVerticesCount = vertexCount;
frameVertices = self->frameVertices; frameVertices = self->frameVertices;

2
spine-ts/build/spine-widget.js
View File

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

2
spine-ts/build/spine-widget.js.map
View File

File diff suppressed because one or more lines are too long