]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
PAL12470: Cannot use boolean operations on COMPOUNDs and COMPSOLIDs. Fix FUSE regression.
authorjfa <jfa@opencascade.com>
Wed, 30 Aug 2006 06:24:58 +0000 (06:24 +0000)
committerjfa <jfa@opencascade.com>
Wed, 30 Aug 2006 06:24:58 +0000 (06:24 +0000)
src/GEOMImpl/GEOMImpl_BooleanDriver.cxx

index ca0812c39f40cff939d4a222462e06c3ad6e188e..08e52e11efdc0e4db88ba235104ffe9cc740ed2e 100644 (file)
@@ -175,21 +175,11 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(TFunction_Logbook& log) const
 
     // perform FUSE operation
     else if (aType == BOOLEAN_FUSE) {
-      // check shapes to provide special processing for compounds and compsolids
-      if (aShape1.ShapeType() == TopAbs_COMPOUND ||
-          aShape1.ShapeType() == TopAbs_COMPSOLID ||
-          aShape2.ShapeType() == TopAbs_COMPOUND ||
-          aShape2.ShapeType() == TopAbs_COMPSOLID) {
-        // at least one of arguments is complex
-        StdFail_NotDone::Raise("Fuse operation aborted: one of arguments is a complex shape");
-      } else {
-        // simple arguments
-        BRepAlgoAPI_Fuse BO (aShape1, aShape2);
-        if (!BO.IsDone()) {
-          StdFail_NotDone::Raise("Fuse operation can not be performed on the given shapes");
-        }
-        aShape = BO.Shape();
+      BRepAlgoAPI_Fuse BO (aShape1, aShape2);
+      if (!BO.IsDone()) {
+        StdFail_NotDone::Raise("Fuse operation can not be performed on the given shapes");
       }
+      aShape = BO.Shape();
     }
 
     // perform SECTION operation