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

remove setParent

This commit is contained in:
yangxiao 2015-09-10 09:28:01 +08:00
parent ff85173b4b
commit 8f5cd6cdc8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/renderer/CCMaterial.cpp
View File

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

6
cocos/renderer/CCRenderState.h
View File

@ -85,12 +85,6 @@ public:
*/
RenderState* getTopmost(RenderState* below);
/**
* Set parent RenderState
* @param parent Parent RenderState
*/
void setParent(RenderState* parent) { _parent = parent; }
enum Blend
{
BLEND_ZERO = GL_ZERO,