From b0de9cbfb67ea41b7a94aa88cbb30821ddbf3401 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Thu, 27 Jan 2022 18:40:45 +0100 Subject: [PATCH] [as3] Ported scale mixing fix, closes #2028. --- spine-as3/spine-as3/src/spine/animation/ScaleTimeline.as | 4 ++-- spine-as3/spine-as3/src/spine/animation/ScaleXTimeline.as | 2 +- spine-as3/spine-as3/src/spine/animation/ScaleYTimeline.as | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-as3/spine-as3/src/spine/animation/ScaleTimeline.as b/spine-as3/spine-as3/src/spine/animation/ScaleTimeline.as index 2bd237ba15..835498cb5f 100644 --- a/spine-as3/spine-as3/src/spine/animation/ScaleTimeline.as +++ b/spine-as3/spine-as3/src/spine/animation/ScaleTimeline.as @@ -115,8 +115,8 @@ package spine.animation { bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha; break; case MixBlend.add: - bone.scaleX = (x - bone.data.scaleX) * alpha; - bone.scaleY = (y - bone.data.scaleY) * alpha; + bone.scaleX += (x - bone.data.scaleX) * alpha; + bone.scaleY += (y - bone.data.scaleY) * alpha; } } else { switch (blend) { diff --git a/spine-as3/spine-as3/src/spine/animation/ScaleXTimeline.as b/spine-as3/spine-as3/src/spine/animation/ScaleXTimeline.as index b3e8c2da48..ed77b6152b 100644 --- a/spine-as3/spine-as3/src/spine/animation/ScaleXTimeline.as +++ b/spine-as3/spine-as3/src/spine/animation/ScaleXTimeline.as @@ -82,7 +82,7 @@ package spine.animation { bone.scaleX = bx + (Math.abs(x) * MathUtils.signum(bx) - bx) * alpha; break; case MixBlend.add: - bone.scaleX = (x - bone.data.scaleX) * alpha; + bone.scaleX += (x - bone.data.scaleX) * alpha; } } else { switch (blend) { diff --git a/spine-as3/spine-as3/src/spine/animation/ScaleYTimeline.as b/spine-as3/spine-as3/src/spine/animation/ScaleYTimeline.as index a750510fe8..b228847f25 100644 --- a/spine-as3/spine-as3/src/spine/animation/ScaleYTimeline.as +++ b/spine-as3/spine-as3/src/spine/animation/ScaleYTimeline.as @@ -82,7 +82,7 @@ package spine.animation { bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha; break; case MixBlend.add: - bone.scaleY = (y - bone.data.scaleY) * alpha; + bone.scaleY += (y - bone.data.scaleY) * alpha; } } else { switch (blend) {