From: vsv <vitaly.smetannikov@opencascade.com>
Date: Fri, 26 Dec 2014 15:38:16 +0000 (+0300)
Subject: Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1
X-Git-Tag: V_0.7.0_rc1~38
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=62ac5cb68c7525abbb4255fe8fcc60f01176512e;p=modules%2Fshaper.git

Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1
---

62ac5cb68c7525abbb4255fe8fcc60f01176512e
diff --cc src/XGUI/XGUI_Displayer.cpp
index 1927d19b8,bf5a05165..8be3d0bca
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@@ -129,10 -131,13 +131,13 @@@ void XGUI_Displayer::display(ObjectPtr 
    Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
    if (!anAISIO.IsNull()) {
      myResult2AISObjectMap[theObject] = theAIS;
 -    bool aCanBeShaded = canBeShaded(anAISIO);
 +    bool aCanBeShaded = ::canBeShaded(anAISIO);
      // In order to avoid extra closing/opening context
-     if (aCanBeShaded)
+     SelectMgr_IndexedMapOfOwner aSelectedOwners;
+     if (aCanBeShaded) {
+       myWorkshop->selector()->selection()->selectedOwners(aSelectedOwners);
        closeLocalContexts(false);
+     }
      aContext->Display(anAISIO, false);
      qDebug("### Display %i", (long)anAISIO.Access());