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] Closes #1740, Parsing of path constraint timelines from JSON files was incorrect.

Browse Source
This commit is contained in:
badlogic 2020-08-26 16:10:43 +02:00
parent b4548b9166
commit 6c5948ab0b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-c/spine-c/src/spine/SkeletonJson.c
View File

@ -152,7 +152,7 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r
Json* slots = Json_getItem(root, "slots"); Json* slots = Json_getItem(root, "slots");
Json* ik = Json_getItem(root, "ik"); Json* ik = Json_getItem(root, "ik");
Json* transform = Json_getItem(root, "transform"); Json* transform = Json_getItem(root, "transform");
Json* paths = Json_getItem(root, "paths"); Json* path = Json_getItem(root, "path");
Json* deformJson = Json_getItem(root, "deform"); Json* deformJson = Json_getItem(root, "deform");
Json* drawOrderJson = Json_getItem(root, "drawOrder"); Json* drawOrderJson = Json_getItem(root, "drawOrder");
Json* events = Json_getItem(root, "events"); Json* events = Json_getItem(root, "events");
@ -165,7 +165,7 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r
timelinesCount += slotMap->size; timelinesCount += slotMap->size;
timelinesCount += ik ? ik->size : 0; timelinesCount += ik ? ik->size : 0;
timelinesCount += transform ? transform->size : 0; timelinesCount += transform ? transform->size : 0;
for (constraintMap = paths ? paths->child : 0; constraintMap; constraintMap = constraintMap->next) for (constraintMap = path ? path->child : 0; constraintMap; constraintMap = constraintMap->next)
timelinesCount += constraintMap->size; timelinesCount += constraintMap->size;
for (constraintMap = deformJson ? deformJson->child : 0; constraintMap; constraintMap = constraintMap->next) for (constraintMap = deformJson ? deformJson->child : 0; constraintMap; constraintMap = constraintMap->next)
for (slotMap = constraintMap->child; slotMap; slotMap = slotMap->next) for (slotMap = constraintMap->child; slotMap; slotMap = slotMap->next)
@ -331,7 +331,7 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r
} }
/** Path constraint timelines. */ /** Path constraint timelines. */
for(constraintMap = paths ? paths->child : 0; constraintMap; constraintMap = constraintMap->next ) { for(constraintMap = path ? path->child : 0; constraintMap; constraintMap = constraintMap->next ) {
int constraintIndex, i; int constraintIndex, i;
Json* timelineMap; Json* timelineMap;