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

Merge pull request #2368 from dumganhar/iss2040-ccb-getScale 

fixed #2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
This commit is contained in:
James Chen 2013-04-14 19:20:36 -07:00
parent a06d2c44c1 a1568d1f74
commit c7631d5343
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/CCBReader/CCBReader.cpp
View File

@ -630,7 +630,8 @@ CCNode * CCBReader::readNodeGraph(CCNode * pParent) {
CCNode *embeddedNode = ccbFileNode->getCCBFileNode();
embeddedNode->setPosition(ccbFileNode->getPosition());
embeddedNode->setRotation(ccbFileNode->getRotation());
embeddedNode->setScale(ccbFileNode->getScale());
embeddedNode->setScaleX(ccbFileNode->getScaleX());
embeddedNode->setScaleY(ccbFileNode->getScaleY());
embeddedNode->setTag(ccbFileNode->getTag());
embeddedNode->setVisible(true);
embeddedNode->ignoreAnchorPointForPosition(ccbFileNode->isIgnoreAnchorPointForPosition());