Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/shaper

[modules/shaper.git] / src / FeaturesPlugin / FeaturesPlugin_Union.cpp

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Union.cpp b/src/FeaturesPlugin/FeaturesPlugin_Union.cpp
index 76683a26fa5a866c2e57a40affcf19d468a82cdd..775da23a3416a93956b2801ec6f296d7a5165766 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Union.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Union.cpp
@@ -29,7 +29,7 @@
 #include <GeomAPI_ShapeIterator.h>
 
 #include <ModelAPI_AttributeSelectionList.h>
-#include <ModelAPI_ResultCompSolid.h>
+#include <ModelAPI_ResultBody.h>
 #include <ModelAPI_Tools.h>
 
 //=================================================================================================
@@ -59,7 +59,7 @@ void FeaturesPlugin_Union::execute()
       return;
     }
     ResultPtr aContext = anObjectAttr->context();
-    ResultCompSolidPtr aResCompSolidPtr = ModelAPI_Tools::compSolidOwner(aContext);
+    ResultBodyPtr aResCompSolidPtr = ModelAPI_Tools::bodyOwner(aContext);
     if(aResCompSolidPtr.get()) {
       std::shared_ptr<GeomAPI_Shape> aContextShape = aResCompSolidPtr->shape();
       std::map<std::shared_ptr<GeomAPI_Shape>, ListOfShape>::iterator
@@ -183,10 +183,10 @@ void FeaturesPlugin_Union::execute()
   for(ListOfShape::const_iterator anIter = anObjects.begin(); anIter != anObjects.end(); ++anIter) {
     aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList, *anIter, GeomAPI_Shape::EDGE,
                                              aModifyEdgeTag, aModEName, aMapOfShapes,
-                                             true, false, true);
+                                             false, true, true);
     aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList, *anIter, GeomAPI_Shape::FACE,
                                              aModifyFaceTag, aModFName, aMapOfShapes,
-                                             true, false, true);
+                                             false, true, true);
     //aResultBody->loadDeletedShapes(&aMakeShapeList, *anIter, GeomAPI_Shape::FACE, aDeletedTag);
   }