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

fix clone

This commit is contained in:
yangxiao 2015-09-11 15:08:59 +08:00
parent 64471fab85
commit ca24e6eba3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/renderer/CCMaterial.cpp
View File

@ -443,9 +443,6 @@ Material* Material::clone() const
{ {
auto t = technique->clone(); auto t = technique->clone();
t->_parent = material; t->_parent = material;
for (ssize_t i = 0; i < t->getPassCount(); i++) {
t->getPassByIndex(i)->_parent = t;
}
material->_techniques.pushBack(t); material->_techniques.pushBack(t);
} }

1
cocos/renderer/CCTechnique.cpp
View File

@ -86,6 +86,7 @@ Technique* Technique::clone() const
for (const auto pass: _passes) for (const auto pass: _passes)
{ {
auto p = pass->clone(); auto p = pass->clone();
p->_parent = technique;
technique->_passes.pushBack(p); technique->_passes.pushBack(p);
} }