Skip to content

Fixed a bug of Sprite that it doesn't work when its texture doesn't preload and its parent is a SpriteBatchNode #1703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2014
Merged

Fixed a bug of Sprite that it doesn't work when its texture doesn't preload and its parent is a SpriteBatchNode #1703

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
960b4d2
Fixed a bug of Sprite that it doesn't work when its texture doesn't p…
dingpinglv Mar 19, 2014
600cc51
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Mar 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cocos2d/core/sprite_nodes/CCSprite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{

// by default use "Self Render".
// if the sprite is added to a batchnode, then it will automatically switch to "batchnode Render"
this.setBatchNode(null);
this.setBatchNode(this._batchNode);
this._quadDirty = true;
this._callLoadedEventCallbacks();
},
Expand All @@ -1333,7 +1333,7 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{

// by default use "Self Render".
// if the sprite is added to a batchnode, then it will automatically switch to "batchnode Render"
this.setBatchNode(null);
this.setBatchNode(this._batchNode);
this._callLoadedEventCallbacks();
},

Expand Down