Merge branch 'origin/master'

This commit is contained in:
NathanSweet 2013-08-02 15:08:13 +02:00
commit 0784725106
3 changed files with 3 additions and 15 deletions

View File

@ -84,11 +84,7 @@ void Bone_updateWorldTransform (Bone* self, int flipX, int flipY) {
CONST_CAST(float, self->m00) = -self->m00;
CONST_CAST(float, self->m01) = -self->m01;
}
if (flipY) {
CONST_CAST(float, self->m10) = -self->m10;
CONST_CAST(float, self->m11) = -self->m11;
}
if (yDown) {
if (flipY != yDown) {
CONST_CAST(float, self->m10) = -self->m10;
CONST_CAST(float, self->m11) = -self->m11;
}

View File

@ -87,11 +87,7 @@ namespace Spine {
M00 = -M00;
M01 = -M01;
}
if (flipY) {
M10 = -M10;
M11 = -M11;
}
if (yDown) {
if (flipY != yDown) {
M10 = -M10;
M11 = -M11;
}

View File

@ -60,11 +60,7 @@ spine.Bone.prototype = {
this.m00 = -this.m00;
this.m01 = -this.m01;
}
if (flipY) {
this.m10 = -this.m10;
this.m11 = -this.m11;
}
if (spine.Bone.yDown) {
if (flipY != spine.Bone.yDown) {
this.m10 = -this.m10;
this.m11 = -this.m11;
}