Merge branch '4.1' into 4.2-beta

This commit is contained in:
Mario Zechner 2022-09-26 10:04:07 +02:00
commit 6ec946708b

View File

@ -1870,6 +1870,7 @@ void _spDeformTimeline_apply(
/* Vertex positions or deform offsets, with alpha. */
for (i = 0; i < vertexCount; i++)
deformArray[i] += (lastVertices[i] - deformArray[i]) * alpha;
break;
case SP_MIX_BLEND_ADD:
vertexAttachment = SUB_CAST(spVertexAttachment, slot->attachment);
if (!vertexAttachment->bones) {