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 remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
NathanSweet 2016-09-13 12:01:31 +02:00
commit 008bceef0a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,10 +569,11 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
CONST_CAST(char*, self->error) = 0; CONST_CAST(char*, self->error) = 0;
internal->linkedMeshCount = 0; internal->linkedMeshCount = 0;
oldLocale = setlocale(LC_NUMERIC, NULL); oldLocale = strdup(setlocale(LC_NUMERIC, NULL));
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
root = Json_create(json); root = Json_create(json);
setlocale(LC_NUMERIC, oldLocale); setlocale(LC_NUMERIC, oldLocale);
free(oldLocale);
if (!root) { if (!root) {
_spSkeletonJson_setError(self, 0, "Invalid skeleton JSON: ", Json_getError()); _spSkeletonJson_setError(self, 0, "Invalid skeleton JSON: ", Json_getError());
return 0; return 0;

4
spine-cocos2dx/src/spine/SkeletonAnimation.cpp
View File

@ -58,14 +58,14 @@ typedef struct _TrackEntryListeners {
static _TrackEntryListeners* getListeners (spTrackEntry* entry) { static _TrackEntryListeners* getListeners (spTrackEntry* entry) {
if (!entry->rendererObject) { if (!entry->rendererObject) {
entry->rendererObject = NEW(spine::_TrackEntryListeners); entry->rendererObject = new spine::_TrackEntryListeners();
entry->listener = trackEntryCallback; entry->listener = trackEntryCallback;
} }
return (_TrackEntryListeners*)entry->rendererObject; return (_TrackEntryListeners*)entry->rendererObject;
} }
void disposeTrackEntry (spTrackEntry* entry) { void disposeTrackEntry (spTrackEntry* entry) {
if (entry->rendererObject) FREE(entry->rendererObject); if (entry->rendererObject) delete (spine::_TrackEntryListeners*)entry->rendererObject;
_spTrackEntry_dispose(entry); _spTrackEntry_dispose(entry);
} }