suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made Body::claimChildren() stabler against NULL items

Browse Source
This commit is contained in:
jrheinlaender 2013-09-20 20:00:21 +02:00 committed by Stefan Tröger
parent 4623f3a7d3
commit e993480ca0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/PartDesign/Gui/ViewProviderBody.cpp
View File

@ -115,10 +115,14 @@ std::vector<App::DocumentObject*> ViewProviderBody::claimChildren(void)const
// search for objects handled (claimed) by the features
for(std::vector<App::DocumentObject*>::const_iterator it = Model.begin();it!=Model.end();++it){
std::vector<App::DocumentObject*> children = Gui::Application::Instance->getViewProvider(*it)->claimChildren();
for (std::vector<App::DocumentObject*>::const_iterator ch = children.begin(); ch != children.end(); ch++)
if (*it == NULL) continue;
Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(*it);
if (vp == NULL) continue;
std::vector<App::DocumentObject*> children = vp->claimChildren();
for (std::vector<App::DocumentObject*>::const_iterator ch = children.begin(); ch != children.end(); ch++) {
if ((*ch) != NULL)
OutSet.insert(*ch);
}
}
// remove the otherwise handled objects, preserving their order so the order in the TreeWidget is correct