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

Final touches of C++ runtime, done.

Browse Source
This commit is contained in:
badlogic 2018-04-20 14:07:17 +02:00
parent ae58c8232f
commit 32f326de0f
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

@ -978,7 +978,7 @@ void AnimationState::animationsChanged() {
for (int i = 0, n = static_cast<int>(_tracks.size()); i < n; ++i) { for (int i = 0, n = static_cast<int>(_tracks.size()); i < n; ++i) {
TrackEntry *entry = _tracks[i]; TrackEntry *entry = _tracks[i];
if (entry != NULL && entry->_mixBlend != MixBlend_Add) { if (entry != NULL && (i == 0 ||entry->_mixBlend != MixBlend_Add)) {
entry->setTimelineData(NULL, _mixingTo, _propertyIDs); entry->setTimelineData(NULL, _mixingTo, _propertyIDs);
} }
} }

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

@ -68,7 +68,7 @@ void DrawOrderTimeline::apply(Skeleton &skeleton, float lastTime, float time, Ve
} }
if (time < _frames[0]) { if (time < _frames[0]) {
if (blend == MixBlend_Setup) { if (blend == MixBlend_Setup || blend == MixBlend_First) {
drawOrder.clear(); drawOrder.clear();
drawOrder.ensureCapacity(slots.size()); drawOrder.ensureCapacity(slots.size());
for (int i = 0, n = static_cast<int>(slots.size()); i < n; ++i) { for (int i = 0, n = static_cast<int>(slots.size()); i < n; ++i) {