From: vsv <vitaly.smetannikov@opencascade.com>
Date: Thu, 4 Jun 2015 13:49:04 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/PortingSalome760' into Dev_1.3.0
X-Git-Tag: V_1.3.0~276
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=98713097930edb46d37ffb835d685ec2ef9439dc;p=modules%2Fshaper.git

Merge remote-tracking branch 'origin/PortingSalome760' into Dev_1.3.0
---

98713097930edb46d37ffb835d685ec2ef9439dc
diff --cc src/XGUI/XGUI_Displayer.cpp
index a3d8b3f9f,844473e78..19da29c51
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@@ -149,31 -149,15 +149,17 @@@ void XGUI_Displayer::display(ObjectPtr 
    if (!anAISIO.IsNull()) {
      appendResultObject(theObject, theAIS);
  
-     bool aCanBeShaded = ::canBeShaded(anAISIO);
-     // In order to avoid extra closing/opening context
-     SelectMgr_IndexedMapOfOwner aSelectedOwners;
-     if (aCanBeShaded) {
-       myWorkshop->selector()->selection()->selectedOwners(aSelectedOwners);
-       closeLocalContexts(false);
-     }
-     aContext->Display(anAISIO, false);
-     aContext->SetDisplayMode(anAISIO, isShading? Shading : Wireframe, false);
+     bool isCustomized = customizeObject(theObject);
+ 
 -    aContext->Display(anAISIO, isShading? Shading : Wireframe, 0, false, true, AIS_DS_Displayed); 
++    int aDispMode = isShading? Shading : Wireframe;
      if (isShading)
        anAISIO->Attributes()->SetFaceBoundaryDraw( Standard_True );
--    emit objectDisplayed(theObject, theAIS);
++    anAISIO->SetDisplayMode(aDispMode);
++    aContext->Display(anAISIO, aDispMode, 0, false, true, AIS_DS_Displayed); 
  
-     bool isCustomized = customizeObject(theObject);
-     if (isCustomized)
-       aContext->Redisplay(anAISIO, false);
- 
-     if (aCanBeShaded) {
-       openLocalContext();
-       activateObjects(myActiveSelectionModes);
-       myWorkshop->selector()->setSelectedOwners(aSelectedOwners, false);
-     }
-     else
-       activate(anAISIO, myActiveSelectionModes);
-  }
++    emit objectDisplayed(theObject, theAIS);
+     activate(anAISIO, myActiveSelectionModes);
+  } 
    if (isUpdateViewer)
      updateViewer();
  }