UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[csharp] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027

Browse Source
This commit is contained in:
badlogic 2017-10-28 09:44:21 +02:00
parent a8c5282653
commit ed2594deca
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-csharp/src/AnimationState.cs
View File

@ -220,9 +220,10 @@ namespace Spine {
if (from.mixingFrom != null) ApplyMixingFrom(from, skeleton, currentPose); if (from.mixingFrom != null) ApplyMixingFrom(from, skeleton, currentPose);
float mix; float mix;
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;
} }