From 9083de94b43ac16e92530632b7613c79256d7a94 Mon Sep 17 00:00:00 2001
From: geron-cn <c.ever.fallen@gmail.com>
Date: Tue, 11 Mar 2014 10:21:43 +0800
Subject: [PATCH] repair bug: changedisplay(armature,i>=0) does not reblind
 parentbone

---
 cocos/editor-support/cocostudio/CCDisplayManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cocos/editor-support/cocostudio/CCDisplayManager.cpp b/cocos/editor-support/cocostudio/CCDisplayManager.cpp
index 70863f5f92..2e39203c8f 100644
--- a/cocos/editor-support/cocostudio/CCDisplayManager.cpp
+++ b/cocos/editor-support/cocostudio/CCDisplayManager.cpp
@@ -293,6 +293,7 @@ void DisplayManager::setCurrentDecorativeDisplay(DecorativeDisplay *decoDisplay)
         if (Armature *armature = dynamic_cast<Armature *>(_displayRenderNode))
         {
             _bone->setChildArmature(armature);
+            armature->setParentBone(_bone);
         }
         else if (ParticleSystemQuad *particle = dynamic_cast<ParticleSystemQuad *>(_displayRenderNode))
         {