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

Merge pull request #10147 from geron-cn/fixProjectNodeLoader 

ProjectNode's actiontimeline  should  jump to 0 frame when  after nest i...
This commit is contained in:
minggo 2015-01-21 15:49:39 +08:00
parent 571e313ff5 2fc79e2da5
commit 86b1f4594a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
View File

@ -843,6 +843,7 @@ Node* CSLoader::nodeWithFlatBuffers(const flatbuffers::NodeTree *nodetree)
if (action)
{
node->runAction(action);
action->gotoFrameAndPause(0);
}
}
@ -1172,6 +1173,7 @@ Node* CSLoader::nodeWithFlatBuffersForSimulator(const flatbuffers::NodeTree *nod
if (action)
{
node->runAction(action);
action->gotoFrameAndPause(0);
}
}
}