Merge remote-tracking branch 'remotes/origin/HigherLevelObjectsHistory'

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_UnifySameDomain.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_UnifySameDomain.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_UnifySameDomain.cpp
index 795a0fac19512a83a9fa9597b84b26200da83bfd..320c30d8fd31b8b7ab81c1093c22f938b416873a 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_UnifySameDomain.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_UnifySameDomain.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "GeomAlgoAPI_UnifySameDomain.h"
@@ -48,18 +47,18 @@ void GeomAlgoAPI_UnifySameDomain::build(const ListOfShape& theShapes)
 
   // Make compound.
   GeomShapePtr aCompound = GeomAlgoAPI_CompoundBuilder::compound(theShapes);
-  ListOfShape aCombined, aFree;
+  ListOfShape aResults;
   GeomAlgoAPI_ShapeTools::combineShapes(
     aCompound,
     GeomAPI_Shape::SHELL,
-    aCombined,
-    aFree);
+    aResults);
 
-  if(aFree.size() > 0 || aCombined.size() > 1) {
+  if(aResults.size() > 1 ||
+     (aResults.size() == 1 && aResults.front()->shapeType() > GeomAPI_Shape::SHELL)) {
     return;
   }
 
-  const TopoDS_Shape& aShell = aCombined.front()->impl<TopoDS_Shape>();
+  const TopoDS_Shape& aShell = aResults.front()->impl<TopoDS_Shape>();
 
   std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
   aShape->setImpl(new TopoDS_Shape(aShell));