kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

improve exception handling in ViewProviderBody::dropObject

Browse Source
This commit is contained in:
wmayer
2018-04-04 17:14:21 +02:00
parent 24eb8eec9b
commit f04d4430aa
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -476,7 +476,7 @@ void ViewProviderBody::dropObject(App::DocumentObject* obj)
if (obj->getTypeId().isDerivedFrom(Part::Part2DObject::getClassTypeId())) {
body->addObject(obj);
}
else if (PartDesignGui::isFeatureMovable(obj)) {
else if (PartDesign::Body::isAllowed(obj) && PartDesignGui::isFeatureMovable(obj)) {
std::vector<App::DocumentObject*> move;
move.push_back(obj);
std::vector<App::DocumentObject*> deps = PartDesignGui::collectMovableDependencies(move);
@@ -485,9 +485,14 @@ void ViewProviderBody::dropObject(App::DocumentObject* obj)
PartDesign::Body* source = PartDesign::Body::findBodyOf(obj);
if (source)
source->removeObjects(move);
body->addObjects(move);
try {
body->addObjects(move);
}
catch (const Base::Exception& e) {
e.ReportException();
}
}
else {
else if (body->BaseFeature.getValue() == nullptr) {
body->BaseFeature.setValue(obj);
}