UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.7-beta' into 3.7-beta-cpp

Browse Source
This commit is contained in:
badlogic 2018-09-05 15:31:42 +02:00
commit dce7731855
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spine-c/spine-c-unit-tests/CMakeLists.txt
View File

@ -3,7 +3,8 @@ project(spine_unit_test)
set(CMAKE_INSTALL_PREFIX "./") set(CMAKE_INSTALL_PREFIX "./")
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKANJI_MEMTRACE -DUSE_CPP11_MUTEX") set (CMAKE_CXX_FLAGS "-Wall -Wextra -Wnon-virtual-dtor -pedantic -std=c++03 -fno-rtti -DKANJI_MEMTRACE -DUSE_CPP11_MUTEX")
######################################################### #########################################################
# set includes # set includes

2
spine-c/spine-c/src/spine/SkeletonJson.c
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);

4
spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
View File

@ -467,7 +467,9 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
type = AttachmentType_Path; type = AttachmentType_Path;
} else if (strcmp(typeString, "clipping") == 0) { } else if (strcmp(typeString, "clipping") == 0) {
type = AttachmentType_Clipping; type = AttachmentType_Clipping;
} else { } else if (strcmp(typeString, "point") == 0) {
type = AttachmentType_Point;
}else {
delete skeletonData; delete skeletonData;
setError(root, "Unknown attachment type: ", typeString); setError(root, "Unknown attachment type: ", typeString);
return NULL; return NULL;