Merge pull request #149 from lvlonggame/v3

super626 · super626 · commit 01e2d62e901e · 2014-10-24T15:43:37.000+08:00
Fix bug: load sprite3D from cache, the attach node will be discarded.
diff --git a/cocos/3d/CCSprite3D.cpp b/cocos/3d/CCSprite3D.cpp
@@ -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++) {
             _meshes.at(i)->setGLProgramState(spritedata->glProgramStates.at(i));
         }

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,14 @@ bool Sprite3D::loadFromCache(const std::string& path)`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ for(const auto& it : spritedata->nodedatas->skeleton)`
	`96`	`+ {`
	`97`	`+ if(it)`
	`98`	`+ {`
	`99`	`+ createAttachSprite3DNode(it,*(spritedata->materialdatas));`
	`100`	`+ }`
	`101`	`+ }`
	`102`	`+`
`95`	`103`	`for (ssize_t i = 0; i < _meshes.size(); i++) {`
`96`	`104`	`_meshes.at(i)->setGLProgramState(spritedata->glProgramStates.at(i));`
`97`	`105`	`}`