Merge branch 'master' of github.com:FreeCAD/FreeCAD

2018-11-20 12:40:27 -02:00
parent 88f47ee725 fa5b47df16
commit 3b7e5492c2
1 changed files with 5 additions and 9 deletions
--- a/src/Mod/Sketcher/App/SketchObject.cpp
+++ b/src/Mod/Sketcher/App/SketchObject.cpp
@@ -1725,16 +1725,12 @@ int SketchObject::fillet(int GeoId1, int GeoId2,

        // add arc to sketch geometry
        int filletId;
-        if (arc) {
-            Part::Geometry *newgeo = arc;
-            filletId = addGeometry(newgeo);
-            if (filletId < 0) {
-                delete arc;
-                return -1;
-            }
-        }
-        else
+        Part::Geometry *newgeo = arc;
+        filletId = addGeometry(newgeo);
+        if (filletId < 0) {
+            delete arc;
            return -1;
+        }

        if (trim) {
            auto selectend = [](double intparam, double refparam, double startparam) {