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

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Harald Csaszar 2022-11-30 18:41:39 +01:00
commit 603c024791
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/spine-c/src/spine/TransformConstraint.c
View File

@ -240,7 +240,7 @@ void _spTransformConstraint_applyRelativeLocal(spTransformConstraint *self) {
} }
void spTransformConstraint_update(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) self->mixShearY == 0)
return; return;

2
spine-cpp/spine-cpp/src/spine/TransformConstraint.cpp
View File

@ -62,7 +62,7 @@ TransformConstraint::TransformConstraint(TransformConstraintData &data, Skeleton
} }
void TransformConstraint::update() { 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.isLocal()) {
if (_data.isRelative()) if (_data.isRelative())

2
spine-csharp/src/TransformConstraint.cs
View File

@ -80,7 +80,7 @@ namespace Spine {
} }
public void Update () { 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.local) {
if (data.relative) if (data.relative)
ApplyRelativeLocal(); ApplyRelativeLocal();

2
spine-ts/spine-core/src/TransformConstraint.ts
View File

@ -80,7 +80,7 @@ export class TransformConstraint implements Updatable {
} }
update () { 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.local) {
if (this.data.relative) if (this.data.relative)