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

Check for null shape before calling ShapeType

Browse Source 
Check for null shape before calling ShapeType
This commit is contained in:
balazs-bamer
2015-02-11 12:22:53 +01:00
committed by wmayer
parent 073749e931
commit e47e22e395
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Surface/App/FeatureBSurf.cpp
View File

@@ -99,7 +99,7 @@ void BSurf::getWire(TopoDS_Wire& aWire)
if(set.obj->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
const Part::TopoShape &ts = static_cast<Part::Feature*>(set.obj)->Shape.getShape();
if(ts._Shape.ShapeType() == TopAbs_WIRE)
if((!ts._Shape.IsNull()) && ts._Shape.ShapeType() == TopAbs_WIRE)
{
const TopoDS_Wire &wire = TopoDS::Wire(ts._Shape);
// resolve the wire, we need edges from now on
@@ -119,7 +119,7 @@ void BSurf::getWire(TopoDS_Wire& aWire)
copier.Perform(sub);
const TopoDS_Shape &copy = copier.Shape();
if(copy.ShapeType() == TopAbs_EDGE) { //Check Shape type and assign edge
if((!copy.IsNull()) && copy.ShapeType() == TopAbs_EDGE) { //Check Shape type and assign edge
aWD->Add(TopoDS::Edge(copy));
edgeCount++;
}

4
src/Mod/Surface/Gui/Command.cpp
View File

@@ -231,7 +231,7 @@ bool CmdSurfaceBSurf::isActive(void)
Part::TopoShape ts = static_cast<Part::Feature*>((*it).pObject)->Shape.getShape();
try {
// make sure the main shape type is edge or wire
if(ts._Shape.ShapeType() == TopAbs_WIRE)
if((!ts._Shape.IsNull()) && ts._Shape.ShapeType() == TopAbs_WIRE)
{
TopoDS_Wire wire = TopoDS::Wire(ts._Shape);
for (TopExp_Explorer wireExplorer (wire, TopAbs_EDGE); wireExplorer.More(); wireExplorer.Next())
@@ -274,7 +274,7 @@ void CmdSurfaceBSurf::createSurface(const char *surfaceNamePrefix, const char *c
Part::TopoShape ts = static_cast<Part::Feature*>((*it).pObject)->Shape.getShape();
bspListCmd << "(App.activeDocument()." << it->FeatName;
// if it is wire, add as wire
if(ts._Shape.ShapeType() == TopAbs_WIRE)
if((!ts._Shape.IsNull()) && ts._Shape.ShapeType() == TopAbs_WIRE)
{
bspListCmd << ", \'Wire1\'),";
}