Merge branch '3.6' into 3.7-beta

This commit is contained in:
badlogic 2018-09-05 15:24:31 +02:00
commit 642687f882
2 changed files with 10 additions and 8 deletions

View File

@ -894,6 +894,8 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
type = SP_ATTACHMENT_PATH; type = SP_ATTACHMENT_PATH;
else if (strcmp(typeString, "clipping") == 0) else if (strcmp(typeString, "clipping") == 0)
type = SP_ATTACHMENT_CLIPPING; type = SP_ATTACHMENT_CLIPPING;
else if (strcmp(typeString, "point") == 0)
type = SP_ATTACHMENT_POINT;
else { else {
spSkeletonData_dispose(skeletonData); spSkeletonData_dispose(skeletonData);
_spSkeletonJson_setError(self, root, "Unknown attachment type: ", typeString); _spSkeletonJson_setError(self, root, "Unknown attachment type: ", typeString);