Merge pull request #168 from jareguo/v0.7

disabled sprite should not display when changing sprite frame
This commit is contained in:
Jare Guo
2015-12-30 20:28:22 +08:00
+1 -1
View File
@@ -341,7 +341,7 @@ var Sprite = cc.Class({
sgNode.setSpriteFrame(self._spriteFrame);
self._applyCapInset(sgNode);
self._applySpriteSize();
if ( !sgNode.isVisible() ) {
if ( this.enabledInHierarchy && !sgNode.isVisible() ) {
sgNode.setVisible(true);
}
},