浏览代码

Final touches of C++ runtime, done.

badlogic 7 年之前
父节点
当前提交
32f326de0f

+ 1 - 1
spine-cpp/spine-cpp/src/spine/AnimationState.cpp

@@ -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);
 		}
 		}
 	}
 	}

+ 1 - 1
spine-cpp/spine-cpp/src/spine/DrawOrderTimeline.cpp

@@ -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) {