Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test

This commit is contained in:
samuele3hu 2014-11-28 10:48:13 +08:00
parent c1f718c3fd 9894c738c1
commit 3ee29b3124
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/2d/CCSprite.cpp
View File

@ -308,7 +308,8 @@ void Sprite::setTexture(const std::string &filename)
setTexture(texture);
Rect rect = Rect::ZERO;
rect.size = texture->getContentSize();
if (texture)
rect.size = texture->getContentSize();
setTextureRect(rect);
}