[as3] Ported scale mixing fix, closes EsotericSoftware#2028.

Libnezz · Jan 27, 2022 · b0de9cb · b0de9cb
1 parent eff8b37
commit b0de9cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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) {