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

[modules/shaper.git] / src / XGUI / XGUI_SelectionMgr.cpp

diff --git a/src/XGUI/XGUI_SelectionMgr.cpp b/src/XGUI/XGUI_SelectionMgr.cpp
index 481db73366a3a4f06714ef767a03a414fbefd2fa..caf78cededfa473823d177c7ad21591edcd6f852 100644 (file)
--- a/src/XGUI/XGUI_SelectionMgr.cpp
+++ b/src/XGUI/XGUI_SelectionMgr.cpp
@@ -43,14 +43,8 @@ void XGUI_SelectionMgr::connectViewers()
 void XGUI_SelectionMgr::onObjectBrowserSelection()
 {
   QList<ObjectPtr> aObjects = myWorkshop->objectBrowser()->selectedObjects();
-  QResultList aResults;
-  foreach(ObjectPtr aObject, aObjects) {
-    ResultPtr aRes = boost::dynamic_pointer_cast<ModelAPI_Result>(aObject);
-    if (aRes)
-      aResults.append(aRes);
-  }
   XGUI_Displayer* aDisplayer = myWorkshop->displayer();
-  aDisplayer->setSelected(aResults);
+  aDisplayer->setSelected(aObjects);
   emit selectionChanged();
 }
 
@@ -65,7 +59,10 @@ void XGUI_SelectionMgr::onViewerSelection()
     if (aResult)
       aFeatures.append(aResult);
   }
+  bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true);
   myWorkshop->objectBrowser()->setObjectsSelected(aFeatures);
+  myWorkshop->objectBrowser()->blockSignals(aBlocked);
+
   emit selectionChanged();
 }