Merge branch '3.6' into 3.7-beta

This commit is contained in:
badlogic 2017-07-12 10:57:29 +02:00
commit 8ad5ea0c46
5 changed files with 3 additions and 1 deletions

View File

@ -192,7 +192,7 @@ package spine {
this.b = za * lb + zb * ld;
this.c = zc * la + zd * lc;
this.d = zc * lb + zd * ld;
if (this.data.transformMode != TransformMode.noScaleOrReflection ? pa * pd - pb * pc < 0 : skeleton.flipX != skeleton.flipY) {
if (this.data.transformMode != TransformMode.noScaleOrReflection ? pa * pd - pb * pc < 0 : this.skeleton.flipX != this.skeleton.flipY) {
this.b = -this.b;
this.d = -this.d;
}

View File

@ -39,5 +39,7 @@ package spine {
public var v : Number;
public var light : Color = new spine.Color(0, 0, 0);
public var dark : Color = new spine.Color(0, 0, 0);
function Vertex() { }
}
}