Merge branch 'master' into HEAD

git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5431 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
jriegel 2012-02-04 08:18:01 +00:00
commit 2b36d3aba8

View File

@ -596,8 +596,9 @@ static PyObject * makeWedge(PyObject *self, PyObject *args)
d.SetCoord(vec.x, vec.y, vec.z); d.SetCoord(vec.x, vec.y, vec.z);
} }
BRepPrim_Wedge mkWedge(gp_Ax2(p,d), xmin, ymin, zmin, z2min, x2min, xmax, ymax, zmax, z2max, x2max); BRepPrim_Wedge mkWedge(gp_Ax2(p,d), xmin, ymin, zmin, z2min, x2min, xmax, ymax, zmax, z2max, x2max);
TopoDS_Shape resultShape = mkWedge.Shell(); BRepBuilderAPI_MakeSolid mkSolid;
return new TopoShapeShellPy(new TopoShape(resultShape)); mkSolid.Add(mkWedge.Shell());
return new TopoShapeSolidPy(new TopoShape(mkSolid.Solid()));
} }
catch (Standard_DomainError) { catch (Standard_DomainError) {
PyErr_SetString(PyExc_Exception, "creation of wedge failed"); PyErr_SetString(PyExc_Exception, "creation of wedge failed");