|
@@ -1367,7 +1367,7 @@ var spine;
|
|
var finished = this.updateMixingFrom(from, delta);
|
|
var finished = this.updateMixingFrom(from, delta);
|
|
from.animationLast = from.nextAnimationLast;
|
|
from.animationLast = from.nextAnimationLast;
|
|
from.trackLast = from.nextTrackLast;
|
|
from.trackLast = from.nextTrackLast;
|
|
- if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
|
|
|
|
|
+ if (to.mixTime > 0 && to.mixTime >= to.mixDuration) {
|
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
|
to.mixingFrom = from.mixingFrom;
|
|
to.mixingFrom = from.mixingFrom;
|
|
if (from.mixingFrom != null)
|
|
if (from.mixingFrom != null)
|
|
@@ -1377,6 +1377,11 @@ var spine;
|
|
}
|
|
}
|
|
return finished;
|
|
return finished;
|
|
}
|
|
}
|
|
|
|
+ if (to.timeScale == 0 && to.mixingTo != null) {
|
|
|
|
+ to.timeScale = 1;
|
|
|
|
+ to.mixTime = 0;
|
|
|
|
+ to.mixDuration = 0;
|
|
|
|
+ }
|
|
from.trackTime += delta * from.timeScale;
|
|
from.trackTime += delta * from.timeScale;
|
|
to.mixTime += delta * to.timeScale;
|
|
to.mixTime += delta * to.timeScale;
|
|
return false;
|
|
return false;
|