|
@@ -138,6 +138,9 @@ namespace Spine {
|
|
|
|
|
|
bool finished = UpdateMixingFrom(from, delta);
|
|
bool finished = UpdateMixingFrom(from, delta);
|
|
|
|
|
|
|
|
+ from.animationLast = from.nextAnimationLast;
|
|
|
|
+ from.trackLast = from.nextTrackLast;
|
|
|
|
+
|
|
// Require mixTime > 0 to ensure the mixing from entry was applied at least once.
|
|
// Require mixTime > 0 to ensure the mixing from entry was applied at least once.
|
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
|
// Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame).
|
|
// Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame).
|
|
@@ -149,8 +152,6 @@ namespace Spine {
|
|
return finished;
|
|
return finished;
|
|
}
|
|
}
|
|
|
|
|
|
- from.animationLast = from.nextAnimationLast;
|
|
|
|
- from.trackLast = from.nextTrackLast;
|
|
|
|
from.trackTime += delta * from.timeScale;
|
|
from.trackTime += delta * from.timeScale;
|
|
to.mixTime += delta * to.timeScale;
|
|
to.mixTime += delta * to.timeScale;
|
|
return false;
|
|
return false;
|