diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp index 11423faa0a..488c7c6717 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp @@ -814,7 +814,7 @@ Node* CSLoader::nodeFromProtocolBuffers(const protocolbuffers::NodeTree &nodetre if(filePath != "") { Node* root = createNodeFromProtocolBuffers(_protocolBuffersPath + filePath); - setPropsForProjectNodeFromProtocolBuffers(node, options, nodeOptions); + setPropsForProjectNodeFromProtocolBuffers(root, options, nodeOptions); cocostudio::timeline::ActionTimeline* action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionFromProtocolBuffers(_protocolBuffersPath + filePath); if(action) @@ -824,6 +824,7 @@ Node* CSLoader::nodeFromProtocolBuffers(const protocolbuffers::NodeTree &nodetre } node = ActionTimelineNode::create(root, action); + node->setName(root->getName()); } curOptions = nodeOptions; diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk index d31578183a..dc7dfea488 100644 --- a/cocos/editor-support/cocostudio/Android.mk +++ b/cocos/editor-support/cocostudio/Android.mk @@ -59,6 +59,7 @@ ActionTimeline/CCActionTimelineCache.cpp \ ActionTimeline/CCFrame.cpp \ ActionTimeline/CCTimeLine.cpp \ ActionTimeline/CCActionTimeline.cpp \ +ActionTimeline/CCActionTimelineNode.cpp \ ActionTimeline/CSLoader.cpp \ CSParseBinary.pb.cc