From: nds <nds@opencascade.com>
Date: Thu, 19 May 2016 16:04:16 +0000 (+0300)
Subject: Issue #1496: The elements in the main object or in the tool object are not displayed
X-Git-Tag: V_2.3.1~79
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=12620e8f983d03617d0bc6292e880dd55119a9ff;p=modules%2Fshaper.git

Issue #1496: The elements in the main object or in the tool object are not displayed

Issue #1488: Select wire when Create face
Workaround until we get fix for: 0027523: Selection owner contains obsolete shape
---

diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp
index be653fd0e..bc1bb7526 100644
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@ -76,6 +76,8 @@ const int MOUSE_SENSITIVITY_IN_PIXEL = 10;  ///< defines the local context mouse
 
 //#define DEBUG_OCCT_SHAPE_SELECTION
 
+#define WORKAROUND_UNTIL_27523_IS_FIXED
+
 void displayedObjects(const Handle(AIS_InteractiveContext)& theAIS, AIS_ListOfInteractive& theList)
 {
   // Get from null point
@@ -332,8 +334,18 @@ bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer)
       if (aNeedToRestoreSelection)
         myWorkshop->module()->storeSelection();
 
+#ifdef WORKAROUND_UNTIL_27523_IS_FIXED
+      if (!myActiveSelectionModes.contains(0))
+        aContext->Activate(aAISIO, 0);
+#endif
+
       aContext->Redisplay(aAISIO, false);
 
+#ifdef WORKAROUND_UNTIL_27523_IS_FIXED
+      if (!myActiveSelectionModes.contains(0))
+        aContext->Deactivate(aAISIO, 0);
+#endif
+
       if (aNeedToRestoreSelection)
         myWorkshop->module()->restoreSelection();