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

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Mario Zechner 2022-10-14 12:07:13 +02:00
commit 649744640c
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/include/spine/Animation.h
View File

@ -110,7 +110,7 @@ namespace spine {
Vector<Timeline *> &getTimelines();
bool hasTimeline(Vector<PropertyId> ids);
bool hasTimeline(Vector<PropertyId> &ids);
float getDuration();

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

@ -50,7 +50,7 @@ Animation::Animation(const String &name, Vector<Timeline *> &timelines, float du
}
}
bool Animation::hasTimeline(Vector<PropertyId> ids) {
bool Animation::hasTimeline(Vector<PropertyId> &ids) {
for (size_t i = 0; i < ids.size(); i++) {
if (_timelineIds.containsKey(ids[i])) return true;
}