Skip to content

Commit 8f1459b

Browse files
drelaptopminggo
authored andcommitted
fix spine crash (cocos2d#18582)
1 parent 4f386a4 commit 8f1459b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cocos/editor-support/spine/SkeletonJson.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,22 +408,22 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r
408408
if (!vertices) {
409409
if (weighted) {
410410
deform2 = tempDeform;
411-
memset(deform, 0, sizeof(float) * deformLength);
411+
memset(deform2, 0, sizeof(float) * deformLength);
412412
} else
413413
deform2 = attachment->vertices;
414414
} else {
415415
int v, start = Json_getInt(valueMap, "offset", 0);
416416
Json* vertex;
417417
deform2 = tempDeform;
418-
memset(deform, 0, sizeof(float) * start);
418+
memset(deform2, 0, sizeof(float) * start);
419419
if (self->scale == 1) {
420420
for (vertex = vertices->child, v = start; vertex; vertex = vertex->next, ++v)
421421
deform2[v] = vertex->valueFloat;
422422
} else {
423423
for (vertex = vertices->child, v = start; vertex; vertex = vertex->next, ++v)
424424
deform2[v] = vertex->valueFloat * self->scale;
425425
}
426-
memset(deform + v, 0, sizeof(float) * (deformLength - v));
426+
memset(deform2 + v, 0, sizeof(float) * (deformLength - v));
427427
if (!weighted) {
428428
float* verticesAttachment = attachment->vertices;
429429
for (v = 0; v < deformLength; ++v)

cocos/editor-support/spine/SkeletonRenderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ void SkeletonRenderer::draw (Renderer* renderer, const Mat4& transform, uint32_t
253253
trianglesTwoColor.indexCount = attachmentVertices->_triangles->indexCount;
254254
trianglesTwoColor.verts = twoColorBatch->allocateVertices(attachmentVertices->_triangles->vertCount);
255255
trianglesTwoColor.vertCount = attachmentVertices->_triangles->vertCount;
256-
for (int ii = 0; i < trianglesTwoColor.vertCount; ii++) {
256+
for (int ii = 0; ii < trianglesTwoColor.vertCount; ii++) {
257257
trianglesTwoColor.verts[ii].texCoords = attachmentVertices->_triangles->verts[ii].texCoords;
258258
}
259259
spVertexAttachment_computeWorldVertices(SUPER(attachment), slot, 0, trianglesTwoColor.vertCount * sizeof(V3F_C4B_C4B_T2F) / 4, (float*)trianglesTwoColor.verts, 0, 7);

0 commit comments

Comments
 (0)