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

Merge pull request #3 from geron-cn/develop 

repair bug: changedisplay(armature,i>=0) does not reblind parentbone
This commit is contained in:
yinkaile 2014-03-11 13:44:27 +08:00
parent 8f1ba73a52 09c6d196a2
commit c60e0676f7
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/editor-support/cocostudio/CCDisplayManager.cpp
View File

@ -294,6 +294,7 @@ void DisplayManager::setCurrentDecorativeDisplay(DecorativeDisplay *decoDisplay)
if (Armature *armature = dynamic_cast<Armature *>(_displayRenderNode)) if (Armature *armature = dynamic_cast<Armature *>(_displayRenderNode))
{ {
_bone->setChildArmature(armature); _bone->setChildArmature(armature);
armature->setParentBone(_bone);
} }
else if (ParticleSystemQuad *particle = dynamic_cast<ParticleSystemQuad *>(_displayRenderNode)) else if (ParticleSystemQuad *particle = dynamic_cast<ParticleSystemQuad *>(_displayRenderNode))
{ {