From: vsv <vsv@opencascade.com>
Date: Fri, 12 Oct 2018 10:29:47 +0000 (+0300)
Subject: Issue #2680: Select whole result if type of selection is "object"
X-Git-Tag: V9_2_0a2~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c93c537c95fde816083747852a8919319873f5f4;p=modules%2Fshaper.git

Issue #2680: Select whole result if type of selection is "object"
---

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index 9642a37af..ec0e2bf6a 100755
--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@ -135,7 +135,9 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
     return aValid;
   }
   // when the SHAPE type is provided by XML as Object, the whole result shape should be selected.
-  if (!aShape.get() && aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
+  //if (!aShape.get() && aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
+  // In case of selection of a feature aShape could be not NULL, but result has to be selected
+  if (aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
     aValid = true;
     return aValid;
   }