diff --git a/src/Mod/PartDesign/App/Body.cpp b/src/Mod/PartDesign/App/Body.cpp index dc99bb13b..339f55e4b 100644 --- a/src/Mod/PartDesign/App/Body.cpp +++ b/src/Mod/PartDesign/App/Body.cpp @@ -327,16 +327,6 @@ void Body::removeFeature(App::DocumentObject* feature) Model.setValues(model); } -bool Body::isFeature(App::DocumentObject* feature) -{ - for(App::DocumentObject* obj : Model.getValues()) { - - if(obj == feature) - return true; - } - return false; -} - App::DocumentObjectExecReturn *Body::execute(void) { diff --git a/src/Mod/PartDesign/App/FeatureBoolean.cpp b/src/Mod/PartDesign/App/FeatureBoolean.cpp index fd0f2d519..87a68f24c 100644 --- a/src/Mod/PartDesign/App/FeatureBoolean.cpp +++ b/src/Mod/PartDesign/App/FeatureBoolean.cpp @@ -85,10 +85,11 @@ App::DocumentObjectExecReturn *Boolean::execute(void) if (baseTopShape._Shape.IsNull()) return new App::DocumentObjectExecReturn("Cannot do boolean operation with invalid base shape"); + // TODO: move PartDesignGui::getBodyFor() from Gui to App and use it here //get the body this boolean feature belongs to PartDesign::Body* baseBody = NULL; for(PartDesign::Body* b : this->getDocument()->getObjectsOfType()) { - if(b->isFeature(this)) { + if(b->hasFeature(this)) { baseBody = b; break; } diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp index dec8a8079..6b845b138 100644 --- a/src/Mod/PartDesign/Gui/Workbench.cpp +++ b/src/Mod/PartDesign/Gui/Workbench.cpp @@ -100,7 +100,7 @@ PartDesign::Body *getBodyFor(App::DocumentObject* obj, bool messageIfNot) //try to find the part the object is in for(PartDesign::Body* b : obj->getDocument()->getObjectsOfType()) { - if(b->isFeature(obj)) { + if(b->hasFeature(obj)) { return b; } }