mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
[as3] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027
This commit is contained in:
parent
5b410bf2ba
commit
77c990c75e
Binary file not shown.
@ -207,9 +207,10 @@ package spine.animation {
|
|||||||
if (from.mixingFrom != null) applyMixingFrom(from, skeleton, currentPose);
|
if (from.mixingFrom != null) applyMixingFrom(from, skeleton, currentPose);
|
||||||
|
|
||||||
var mix : Number = 0;
|
var mix : Number = 0;
|
||||||
if (to.mixDuration == 0) // Single frame mix to undo mixingFrom changes.
|
if (to.mixDuration == 0) { // Single frame mix to undo mixingFrom changes.
|
||||||
mix = 1;
|
mix = 1;
|
||||||
else {
|
currentPose = MixPose.setup;
|
||||||
|
} else {
|
||||||
mix = to.mixTime / to.mixDuration;
|
mix = to.mixTime / to.mixDuration;
|
||||||
if (mix > 1) mix = 1;
|
if (mix > 1) mix = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user