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

Merge pull request #149 from lvlonggame/v3 

Fix bug: load sprite3D from cache, the attach node will be discarded.
This commit is contained in:
XiaoYang 2014-10-24 15:43:37 +08:00
parent 7cf5b50790 799f375802
commit 01e2d62e90
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/3d/CCSprite3D.cpp
View File

@ -92,6 +92,14 @@ bool Sprite3D::loadFromCache(const std::string& path)
} }
} }
for(const auto& it : spritedata->nodedatas->skeleton)
{
if(it)
{
createAttachSprite3DNode(it,*(spritedata->materialdatas));
}
}
for (ssize_t i = 0; i < _meshes.size(); i++) { for (ssize_t i = 0; i < _meshes.size(); i++) {
_meshes.at(i)->setGLProgramState(spritedata->glProgramStates.at(i)); _meshes.at(i)->setGLProgramState(spritedata->glProgramStates.at(i));
} }