CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed memory error

Browse Source
This commit is contained in:
andreja6
2020-03-13 18:06:55 -07:00
parent 24854a062a
commit f08799d49c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PartInstance.cpp
View File

@@ -76,19 +76,20 @@ void PartInstance::postRender(RenderDevice *rd)
} }
} }
void PartInstance::setParent(Instance* parent) void PartInstance::setParent(Instance* prnt)
{ {
Instance * cparent = this->parent; Instance * cparent = getParent();
while(cparent != NULL) while(cparent != NULL)
{ {
if(WorkspaceInstance* workspace = dynamic_cast<WorkspaceInstance*>(parent)) if(WorkspaceInstance* workspace = dynamic_cast<WorkspaceInstance*>(cparent))
{ {
std::cout << "Removed from partarray " << std::endl;
workspace->partObjects.erase(std::remove(workspace->partObjects.begin(), workspace->partObjects.end(), this), workspace->partObjects.end()); workspace->partObjects.erase(std::remove(workspace->partObjects.begin(), workspace->partObjects.end(), this), workspace->partObjects.end());
break; break;
} }
cparent = cparent->getParent(); cparent = cparent->getParent();
} }
Instance::setParent(parent); Instance::setParent(prnt);
while(parent != NULL) while(parent != NULL)
{ {
if(WorkspaceInstance* workspace = dynamic_cast<WorkspaceInstance*>(parent)) if(WorkspaceInstance* workspace = dynamic_cast<WorkspaceInstance*>(parent))