mirror of https://github.com/axmolengine/axmol.git
remove setParent
This commit is contained in:
parent
ff85173b4b
commit
8f5cd6cdc8
|
@ -442,9 +442,9 @@ Material* Material::clone() const
|
||||||
for (const auto& technique: _techniques)
|
for (const auto& technique: _techniques)
|
||||||
{
|
{
|
||||||
auto t = technique->clone();
|
auto t = technique->clone();
|
||||||
t->setParent(material);
|
t->_parent = material;
|
||||||
for (ssize_t i = 0; i < t->getPassCount(); i++) {
|
for (ssize_t i = 0; i < t->getPassCount(); i++) {
|
||||||
t->getPassByIndex(i)->setParent(t);
|
t->getPassByIndex(i)->_parent = t;
|
||||||
}
|
}
|
||||||
material->_techniques.pushBack(t);
|
material->_techniques.pushBack(t);
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,12 +84,6 @@ public:
|
||||||
* Returns the topmost RenderState in the hierarchy below the given RenderState.
|
* Returns the topmost RenderState in the hierarchy below the given RenderState.
|
||||||
*/
|
*/
|
||||||
RenderState* getTopmost(RenderState* below);
|
RenderState* getTopmost(RenderState* below);
|
||||||
|
|
||||||
/**
|
|
||||||
* Set parent RenderState
|
|
||||||
* @param parent Parent RenderState
|
|
||||||
*/
|
|
||||||
void setParent(RenderState* parent) { _parent = parent; }
|
|
||||||
|
|
||||||
enum Blend
|
enum Blend
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue