From ed8f238524ad9ebff5585bfe8cda7f4fd2bf2c68 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 22 Nov 2017 18:07:20 +0800 Subject: [PATCH] [csharp] Removed bad fix for #1024 based on https://github.com/EsotericSoftware/spine-runtimes/commit/1514b4acbb481fb300fedd5e1176a2d9c08bec8d#diff-2e690293d0fea3104ddda07be1d1e5c9 --- spine-csharp/src/AnimationState.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/spine-csharp/src/AnimationState.cs b/spine-csharp/src/AnimationState.cs index 91157098c..5e72650f6 100644 --- a/spine-csharp/src/AnimationState.cs +++ b/spine-csharp/src/AnimationState.cs @@ -69,7 +69,7 @@ namespace Spine { trackEntryPool ); } - + /// /// Increments the track entry times, setting queued animations as current if needed /// delta time @@ -259,17 +259,12 @@ namespace Spine { break; case Dip: pose = MixPose.Setup; - alpha = mix == 1 ? 0 : alphaDip; + alpha = alphaDip; break; default: pose = MixPose.Setup; - if (mix == 1) { - alpha = 0; - } else { - alpha = alphaDip; - var dipMix = timelineDipMix[i]; - alpha *= Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration); - } + TrackEntry dipMix = timelineDipMix[i]; + alpha = alphaDip * Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration); break; } from.totalAlpha += alpha;