Merge branch 'master' into optimizeLinearSegments_fix

FreeCAD · Jun 8, 2020 · bec4afa · bec4afa
2 parents f6ae7c2 + 8311b1e
commit bec4afa
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/Mod/Part/App/FeatureFillet.cpp b/src/Mod/Part/App/FeatureFillet.cpp
@@ -73,6 +73,18 @@ App::DocumentObjectExecReturn *Fillet::execute(void)
         TopoDS_Shape shape = mkFillet.Shape();
         if (shape.IsNull())
             return new App::DocumentObjectExecReturn("Resulting shape is null");
+
+        //shapefix re #4285
+        //https://www.forum.freecadweb.org/viewtopic.php?f=3&t=43890&sid=dae2fa6fda71670863a103b42739e47f
+        TopoShape* ts = new TopoShape(shape);
+        double minTol = 2.0 * Precision::Confusion();
+        double maxTol = 4.0 * Precision::Confusion();
+        bool rc = ts->fix(Precision::Confusion(), minTol, maxTol);
+        if (rc) {
+            shape = ts->getShape();
+        }
+        delete ts;
+
         ShapeHistory history = buildHistory(mkFillet, TopAbs_FACE, shape, baseShape);
         this->Shape.setValue(shape);