From: eap <eap@opencascade.com>
Date: Mon, 14 Nov 2016 12:44:16 +0000 (+0300)
Subject: Regression: outline is not shown if selection disabled before showing
X-Git-Tag: V8_2_0b1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7ee75034e28413772c7f45759d8633759a172b45;p=modules%2Fsmesh.git

Regression: outline is not shown if selection disabled before showing
---

diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index ada5f91b8..dbc69f410 100644
--- a/src/OBJECT/SMESH_Actor.cxx
+++ b/src/OBJECT/SMESH_Actor.cxx
@@ -1142,7 +1142,7 @@ void SMESH_ActorDef::AddToRender(vtkRenderer* theRenderer)
   if ( !mySelector || !mySelector->IsSelectionEnabled() )
   {
     myBaseActor->SetUnstructuredGrid( NULL );
-    myHighlitableActor->SetUnstructuredGrid( NULL );
+    //myHighlitableActor->SetUnstructuredGrid( NULL );
   }
   theRenderer->AddActor(myBaseActor);
   theRenderer->AddActor(myNodeExtActor);
@@ -1858,11 +1858,6 @@ void SMESH_ActorDef::UpdateHighlight()
   case SMESH_DeviceActor::eSurface:
   case SMESH_DeviceActor::eWireframe:
     {
-      // if ( !mySelector || !mySelector->IsSelectionEnabled() )
-      //   myHighlitableActor->SetUnstructuredGrid( NULL );
-      // else if ( !myHighlitableActor->myExtractUnstructuredGrid->GetInput() )
-      //   myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
-
       if(myIsHighlighted) {
         myHighlitableActor->SetProperty(myHighlightProp);
       }else if(myIsPreselected){
@@ -1902,16 +1897,16 @@ void SMESH_ActorDef::EnableSelection( bool enable )
   if ( enable && ! myBaseActor->myExtractUnstructuredGrid->GetInput() )
   {
     myBaseActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
-    myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
+    //myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
     myBaseActor->myExtractUnstructuredGrid->Update();
-    myHighlitableActor->myExtractUnstructuredGrid->Update();
+    //myHighlitableActor->myExtractUnstructuredGrid->Update();
   }
   if ( !enable && myBaseActor->myExtractUnstructuredGrid->GetInput() )
   {
     myBaseActor->SetUnstructuredGrid( NULL );
-    myHighlitableActor->SetUnstructuredGrid( NULL );
+    //myHighlitableActor->SetUnstructuredGrid( NULL );
     myBaseActor->myExtractUnstructuredGrid->Update();
-    myHighlitableActor->myExtractUnstructuredGrid->Update();
+    //myHighlitableActor->myExtractUnstructuredGrid->Update();
   }
 }
 
@@ -2348,7 +2343,7 @@ void SMESH_ActorDef::SetOpenGLClippingPlane()
   if ( !mySelector || !mySelector->IsSelectionEnabled() )
   {
     myBaseActor->SetUnstructuredGrid( NULL );
-    myHighlitableActor->SetUnstructuredGrid( NULL );
+    //myHighlitableActor->SetUnstructuredGrid( NULL );
   }
   my1DActor->SetPlaneCollection( myPlaneCollection );
   my1DActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());