UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 15:24:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' of https://github.com/EsotericSoftware/spine-runtimes into 4.0

Browse Source
This commit is contained in:
Harald Csaszar 2021-09-01 18:55:31 +02:00
commit fe26fee6e4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-cocos2dx/src/spine/SkeletonRenderer.cpp
View File

@ -189,7 +189,7 @@ namespace spine {
SkeletonJson json(_attachmentLoader);
json.setScale(scale);
SkeletonData *skeletonData = json.readSkeletonDataFile(skeletonDataFile.c_str());
CCASSERT(skeletonData, !json.getError().isEmpty() ? json.getError().buffer() : "Error reading skeleton data.");
CCASSERT(skeletonData, (!json.getError().isEmpty() ? json.getError().buffer() : "Error reading skeleton data."));
_ownsSkeleton = true;
setSkeletonData(skeletonData, true);
@ -206,7 +206,7 @@ namespace spine {
SkeletonJson json(_attachmentLoader);
json.setScale(scale);
SkeletonData *skeletonData = json.readSkeletonDataFile(skeletonDataFile.c_str());
CCASSERT(skeletonData, !json.getError().isEmpty() ? json.getError().buffer() : "Error reading skeleton data.");
CCASSERT(skeletonData, (!json.getError().isEmpty() ? json.getError().buffer() : "Error reading skeleton data."));
_ownsSkeleton = true;
_ownsAtlas = true;
@ -222,7 +222,7 @@ namespace spine {
SkeletonBinary binary(_attachmentLoader);
binary.setScale(scale);
SkeletonData *skeletonData = binary.readSkeletonDataFile(skeletonDataFile.c_str());
CCASSERT(skeletonData, !binary.getError().isEmpty() ? binary.getError().buffer() : "Error reading skeleton data.");
CCASSERT(skeletonData, (!binary.getError().isEmpty() ? binary.getError().buffer() : "Error reading skeleton data."));
_ownsSkeleton = true;
setSkeletonData(skeletonData, true);
@ -238,7 +238,7 @@ namespace spine {
SkeletonBinary binary(_attachmentLoader);
binary.setScale(scale);
SkeletonData *skeletonData = binary.readSkeletonDataFile(skeletonDataFile.c_str());
CCASSERT(skeletonData, !binary.getError().isEmpty() ? binary.getError().buffer() : "Error reading skeleton data.");
CCASSERT(skeletonData, (!binary.getError().isEmpty() ? binary.getError().buffer() : "Error reading skeleton data."));
_ownsSkeleton = true;
_ownsAtlas = true;
setSkeletonData(skeletonData, true);