Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Chenguang Liu committed Jun 20, 2013
2 parents 7483cef + ce2b9c7 commit 4a66e16
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/dragonBones/display/StarlingDisplayBridge.as
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
}

//Thanks Jian
if (_display is Image && value is Image)
//bug replace image.texture will lost displayList[0].texture
/*if (_display is Image && value is Image)
{
var from:Image = _display as Image;
var to:Image = value as Image;
Expand All @@ -60,7 +61,7 @@
from.pivotY = to.pivotY;
from.readjustSize();
return;
}
}*/

if (_display)
{
Expand Down

0 comments on commit 4a66e16

Please sign in to comment.