From: mpv <mpv@opencascade.com>
Date: Fri, 28 Dec 2018 08:33:47 +0000 (+0300)
Subject: Fix for the #2716 comment 3 : make smash allow sub-solids selected, but "Apply" butto... 
X-Git-Tag: End2018~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=384c819a1edf4b726e3a523c1ffd2b5e6b16a4c0;p=modules%2Fshaper.git

Fix for the #2716 comment 3 : make smash allow sub-solids selected, but "Apply" button is disabled
---

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Validators.cpp b/src/FeaturesPlugin/FeaturesPlugin_Validators.cpp
index 844018c7f..7e0b51b93 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Validators.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Validators.cpp
@@ -1427,15 +1427,6 @@ bool FeaturesPlugin_ValidatorBooleanSmashSelection::isValid(
         theError = "Error: Selected shapes should have the same type.";
         return false;
       }
-
-      ResultBodyPtr aResCompSolidPtr = ModelAPI_Tools::bodyOwner(aContext);
-      if (aResCompSolidPtr.get()) {
-        GeomShapePtr aCompSolidShape = aResCompSolidPtr->shape();
-        if (aSelectedCompSolidsInOtherList.isBound(aCompSolidShape)) {
-          theError = "Error: Solids from compsolid in other list not allowed.";
-          return false;
-        }
-      }
     } else {
       GeomAPI_Face aFace(aShape);
       GeomPlanePtr aPln = aFace.getPlane();
diff --git a/src/FeaturesPlugin/boolean_smash_widget.xml b/src/FeaturesPlugin/boolean_smash_widget.xml
index cb755c187..c11b9d464 100644
--- a/src/FeaturesPlugin/boolean_smash_widget.xml
+++ b/src/FeaturesPlugin/boolean_smash_widget.xml
@@ -40,4 +40,5 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
     <validator id="PartSet_DifferentObjects"/>
     <validator id="FeaturesPlugin_ValidatorBooleanSmashSelection"/>
   </multi_selector>
+  <validator id="FeaturesPlugin_ValidatorBooleanArguments" parameters="main_objects,tool_objects"/>
 </source>