Porting on SALOME CVS HEAD

diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index 836065fc8042891d349030cd645a63dbf15e0a8d..28163b263fa47cce44689656a717669d8088aaba 100644 (file)
--- a/src/SVTK/SALOME_Actor.cxx
+++ b/src/SVTK/SALOME_Actor.cxx
@@ -116,8 +116,8 @@ SALOME_Actor
   mySelectionMode(ActorSelection),
   myIsHighlighted(false),
   myIsPreselected(false),
-  myRepresentation(VTK_WIREFRAME),
-  myDisplayMode(0),
+  myRepresentation(VTK_SURFACE),
+  myDisplayMode(1),
   myProperty(vtkProperty::New()),
   PreviewProperty(NULL),
   myIsInfinite(false),
@@ -704,15 +704,19 @@ SALOME_Actor
 ::highlight(bool theHighlight, 
            Selection_Mode theSelectionMode)
 {
-  myIsHighlighted = theHighlight; 
-
-  if( !GetVisibility() )
-    return;
-
-  myOutline->SetBounds( GetBounds() );
-  myOutlineActor->SetVisibility( theHighlight );
-
-  myHighlightActor->SetVisibility( theHighlight && theSelectionMode != ActorSelection );
+  if(hasHighlight() && theSelectionMode == ActorSelection)
+    highlight(theHighlight);
+  else{
+    myIsHighlighted = theHighlight; 
+    
+    if( !GetVisibility() )
+      return;
+    
+    myOutline->SetBounds( GetBounds() );
+    myOutlineActor->SetVisibility( theHighlight );
+    
+    myHighlightActor->SetVisibility( theHighlight && theSelectionMode != ActorSelection );
+  }
 }
 
 //----------------------------------------------------------------