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

closed #4462: Wrong logic in CCBAnimationManager::moveAnimationsFromNode.

This commit is contained in:
James Chen 2014-03-20 17:43:44 +08:00
parent 625ec5a882
commit dcd919d9f7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp
View File

@ -295,8 +295,8 @@ void CCBAnimationManager::moveAnimationsFromNode(Node* fromNode, Node* toNode)
auto baseValueIter = _baseValues.find(fromNode);
if(baseValueIter != _baseValues.end())
{
_baseValues.erase(baseValueIter);
_baseValues[toNode] = baseValueIter->second;
_baseValues.erase(baseValueIter);
// fromNode->release();
// toNode->retain();
}
@ -304,8 +304,8 @@ void CCBAnimationManager::moveAnimationsFromNode(Node* fromNode, Node* toNode)
auto objIter = _objects.find(fromNode);
if (objIter != _objects.end())
{
_objects.erase(objIter);
_objects[toNode] = objIter->second;
_objects.erase(objIter);
}
@ -313,9 +313,8 @@ void CCBAnimationManager::moveAnimationsFromNode(Node* fromNode, Node* toNode)
auto seqsIter = _nodeSequences.find(fromNode);
if (seqsIter != _nodeSequences.end())
{
_nodeSequences.erase(seqsIter);
_nodeSequences[toNode] = seqsIter->second;
_nodeSequences.erase(seqsIter);
// fromNode->release();
// toNode->retain();
}