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

FreeCAD · May 13, 2016 · 0e4132a · 0e4132a
2 parents 3632129 + c21888a
commit 0e4132a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp
@@ -27,6 +27,7 @@
 # include <BRep_Tool.hxx>
 # include <BRepCheck_Analyzer.hxx>
 # include <BRepTools.hxx>
+# include <BRepBuilderAPI_FindPlane.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
 # include <ShapeAnalysis.hxx>
 # include <BRepAdaptor_Surface.hxx>
@@ -254,6 +255,11 @@ PyObject* TopoShapeFacePy::makeOffset(PyObject *args)
     if (!PyArg_ParseTuple(args, "d",&dist))
         return 0;
     const TopoDS_Face& f = TopoDS::Face(getTopoShapePtr()->_Shape);
+    BRepBuilderAPI_FindPlane findPlane(f);
+    if (!findPlane.Found()) {
+        PyErr_SetString(PartExceptionOCCError, "No planar face");
+        return 0;
+    }
 
     BRepOffsetAPI_MakeOffset mkOffset(f);
     mkOffset.Perform(dist);

diff --git a/src/Mod/Part/App/TopoShapeWirePyImp.cpp b/src/Mod/Part/App/TopoShapeWirePyImp.cpp
@@ -26,6 +26,7 @@
 # include <Approx_Curve3d.hxx>
 # include <ShapeAlgo_AlgoContainer.hxx>
 # include <BRepAdaptor_CompCurve.hxx>
+# include <BRepBuilderAPI_FindPlane.hxx>
 # include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepOffsetAPI_MakeOffset.hxx>
 # include <Precision.hxx>
@@ -225,6 +226,11 @@ PyObject* TopoShapeWirePy::makeOffset(PyObject *args)
     if (!PyArg_ParseTuple(args, "d",&dist))
         return 0;
     const TopoDS_Wire& w = TopoDS::Wire(getTopoShapePtr()->_Shape);
+    BRepBuilderAPI_FindPlane findPlane(w);
+    if (!findPlane.Found()) {
+        PyErr_SetString(PartExceptionOCCError, "No planar wire");
+        return 0;
+    }
 
     BRepOffsetAPI_MakeOffset mkOffset(w);
     mkOffset.Perform(dist);