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

Merge branch 'patch-1' of https://github.com/zhanghaojie/cocos2d-x into iss2054-s9sp-anchorpoint-ccb

This commit is contained in:
James Chen 2013-04-15 11:45:59 +08:00
parent 028bba3959 4c67fd979e
commit b228a13218
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/CCBReader/CCScale9SpriteLoader.cpp
View File

@ -17,7 +17,7 @@ NS_CC_EXT_BEGIN
void CCScale9SpriteLoader::onHandlePropTypeSpriteFrame(CCNode * pNode, CCNode * pParent, const char * pPropertyName, CCSpriteFrame * pCCSpriteFrame, CCBReader * pCCBReader) {
if(strcmp(pPropertyName, PROPERTY_SPRITEFRAME) == 0) {
((CCScale9Sprite *)pNode)->initWithSpriteFrame(pCCSpriteFrame);
((CCScale9Sprite *)pNode)->setSpriteFrame(pCCSpriteFrame);
} else {
CCNodeLoader::onHandlePropTypeSpriteFrame(pNode, pParent, pPropertyName, pCCSpriteFrame, pCCBReader);
}
@ -72,4 +72,4 @@ void CCScale9SpriteLoader::onHandlePropTypeFloat(CCNode * pNode, CCNode * pParen
}
}
NS_CC_EXT_END
NS_CC_EXT_END