From 4bad9ec25e3281361a6599509881397711722e58 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Wed, 30 Nov 2022 12:57:49 -0400 Subject: [PATCH 1/3] [libgdx] Fixed typo in transform constraint shortcut for 0 mix. --- .../src/com/esotericsoftware/spine/TransformConstraint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java index 8a866e70e..9679b204f 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/TransformConstraint.java @@ -82,7 +82,7 @@ public class TransformConstraint implements Updatable { /** Applies the constraint to the constrained bones. */ public void update () { - if (mixRotate == 0 && mixX == 0 && mixY == 0 && mixScaleX == 0 && mixScaleX == 0 && mixShearY == 0) return; + if (mixRotate == 0 && mixX == 0 && mixY == 0 && mixScaleX == 0 && mixScaleY == 0 && mixShearY == 0) return; if (data.local) { if (data.relative) applyRelativeLocal(); From 88ef4bc5f76d2552ed4202594476b5e3b49ad717 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Wed, 30 Nov 2022 18:22:50 +0100 Subject: [PATCH 2/3] [csharp] Port of commit 4bad9ec2. Fixed typo in transform constraint shortcut for 0 mix. --- spine-csharp/src/TransformConstraint.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-csharp/src/TransformConstraint.cs b/spine-csharp/src/TransformConstraint.cs index b80804429..594ca7799 100644 --- a/spine-csharp/src/TransformConstraint.cs +++ b/spine-csharp/src/TransformConstraint.cs @@ -80,7 +80,7 @@ namespace Spine { } public void Update () { - if (mixRotate == 0 && mixX == 0 && mixY == 0 && mixScaleX == 0 && mixScaleX == 0 && mixShearY == 0) return; + if (mixRotate == 0 && mixX == 0 && mixY == 0 && mixScaleX == 0 && mixScaleY == 0 && mixShearY == 0) return; if (data.local) { if (data.relative) ApplyRelativeLocal(); From 38ae6f886cbf2a84f3c47df40e2cfdb5f8c32511 Mon Sep 17 00:00:00 2001 From: Luke Ingram Date: Wed, 30 Nov 2022 13:33:07 -0400 Subject: [PATCH 3/3] [c][cpp][ts] Port of 4bad9ec25e3281361a6599509881397711722e58 --- spine-c/spine-c/src/spine/TransformConstraint.c | 2 +- spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp | 2 +- spine-ts/spine-core/src/TransformConstraint.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-c/spine-c/src/spine/TransformConstraint.c b/spine-c/spine-c/src/spine/TransformConstraint.c index 9aaa64e05..ec67f289d 100644 --- a/spine-c/spine-c/src/spine/TransformConstraint.c +++ b/spine-c/spine-c/src/spine/TransformConstraint.c @@ -240,7 +240,7 @@ void _spTransformConstraint_applyRelativeLocal(spTransformConstraint *self) { } void spTransformConstraint_update(spTransformConstraint *self) { - if (self->mixRotate == 0 && self->mixX == 0 && self->mixY == 0 && self->mixScaleX == 0 && self->mixScaleX == 0 && + if (self->mixRotate == 0 && self->mixX == 0 && self->mixY == 0 && self->mixScaleX == 0 && self->mixScaleY == 0 && self->mixShearY == 0) return; diff --git a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp index 1d0611011..94e114dc0 100644 --- a/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp +++ b/spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp @@ -62,7 +62,7 @@ TransformConstraint::TransformConstraint(TransformConstraintData &data, Skeleton } void TransformConstraint::update() { - if (_mixRotate == 0 && _mixX == 0 && _mixY == 0 && _mixScaleX == 0 && _mixScaleX == 0 && _mixShearY == 0) return; + if (_mixRotate == 0 && _mixX == 0 && _mixY == 0 && _mixScaleX == 0 && _mixScaleY == 0 && _mixShearY == 0) return; if (_data.isLocal()) { if (_data.isRelative()) diff --git a/spine-ts/spine-core/src/TransformConstraint.ts b/spine-ts/spine-core/src/TransformConstraint.ts index 797db5c3d..b742c9a41 100644 --- a/spine-ts/spine-core/src/TransformConstraint.ts +++ b/spine-ts/spine-core/src/TransformConstraint.ts @@ -80,7 +80,7 @@ export class TransformConstraint implements Updatable { } update () { - if (this.mixRotate == 0 && this.mixX == 0 && this.mixY == 0 && this.mixScaleX == 0 && this.mixScaleX == 0 && this.mixShearY == 0) return; + if (this.mixRotate == 0 && this.mixX == 0 && this.mixY == 0 && this.mixScaleX == 0 && this.mixScaleY == 0 && this.mixShearY == 0) return; if (this.data.local) { if (this.data.relative)