UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +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-08-13 14:09:55 +02:00
commit 7a7fc714c0
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/AnimationState.cpp
View File

@ -46,7 +46,7 @@
using namespace spine; using namespace spine;
void dummyOnAnimationEventFunc(AnimationState *state, EventType type, TrackEntry *entry, Event *event = NULL) { void dummyOnAnimationEventFunc(AnimationState *state, spine::EventType type, TrackEntry *entry, Event *event = NULL) {
SP_UNUSED(state); SP_UNUSED(state);
SP_UNUSED(type); SP_UNUSED(type);
SP_UNUSED(entry); SP_UNUSED(entry);

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

@ -199,7 +199,7 @@ bool SkeletonBounds::intersectsSegment(Polygon *polygon, float x1, float y1, flo
return false; return false;
} }
Polygon *SkeletonBounds::getPolygon(BoundingBoxAttachment *attachment) { spine::Polygon *SkeletonBounds::getPolygon(BoundingBoxAttachment *attachment) {
int index = _boundingBoxes.indexOf(attachment); int index = _boundingBoxes.indexOf(attachment);
return index == -1 ? NULL : _polygons[index]; return index == -1 ? NULL : _polygons[index];