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

+ fixes #0001429: don't apply booleans on null shapes

Browse Source
This commit is contained in:
wmayer
2014-02-22 13:06:30 +01:00
parent 4ee18348cb
commit 59a8e1d181
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Part/App/FeaturePartFuse.cpp
View File

@@ -87,7 +87,12 @@ App::DocumentObjectExecReturn *MultiFuse::execute(void)
try {
std::vector<ShapeHistory> history;
TopoDS_Shape resShape = s.front();
if (resShape.IsNull())
throw Base::Exception("Input shape is null");
for (std::vector<TopoDS_Shape>::iterator it = s.begin()+1; it != s.end(); ++it) {
if (it->IsNull())
throw Base::Exception("Input shape is null");
// Let's call algorithm computing a fuse operation:
BRepAlgoAPI_Fuse mkFuse(resShape, *it);
// Let's check if the fusion has been successful
@@ -108,7 +113,7 @@ App::DocumentObjectExecReturn *MultiFuse::execute(void)
}
}
if (resShape.IsNull())
throw Base::Exception("Resulting shape is invalid");
throw Base::Exception("Resulting shape is null");
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Part/Boolean");