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

Merge pull request #11416 from super626/v3 

Sprite3D fix
This commit is contained in:
minggo 2015-04-14 10:04:22 +08:00
parent d4d7a3a7b0 37dc4c33d9
commit 7f1d48978f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/3d/CCAnimation3D.cpp
View File

@ -58,6 +58,8 @@ bool Animation3D::initWithFile(const std::string& filename, const std::string& a
Animation3DData animationdata;
if (bundle->load(fullPath) && bundle->loadAnimationData(animationName, &animationdata) && init(animationdata))
{
std::string key = fullPath + "#" + animationName;
Animation3DCache::getInstance()->addAnimation(key, this);
Bundle3D::destroyBundle(bundle);
return true;
}

2
cocos/3d/CCSprite3D.cpp
View File

@ -573,7 +573,7 @@ void Sprite3D::createNode(NodeData* nodedata, Node* root, const MaterialDatas& m
}
for(const auto& it : nodedata->children)
{
createNode(it,node, matrialdatas, singleSprite);
createNode(it,node, matrialdatas, nodedata->children.size() == 1);
}
}