UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 17:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' into 4.0-beta

Browse Source
This commit is contained in:
badlogic 2020-08-26 16:12:52 +02:00
commit fdc96d8c8e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cpp/spine-cpp/src/spine/Json.cpp
View File

@ -120,7 +120,7 @@ Json::Json(const char *value) :
}
Json::~Json() {
spine::Json* curr = nullptr;
spine::Json* curr = NULL;
spine::Json* next = _child;
do {
curr = next;

2
spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp
View File

@ -380,7 +380,7 @@ char *SkeletonBinary::readString(DataInput *input) {
char* SkeletonBinary::readStringRef(DataInput* input, SkeletonData* skeletonData) {
int index = readVarint(input, true);
return index == 0 ? nullptr : skeletonData->_strings[index - 1];
return index == 0 ? NULL : skeletonData->_strings[index - 1];
}
float SkeletonBinary::readFloat(DataInput *input) {