Merge from V6_3_1_BR (V6_3_1rc3 tag) 15/07/2011

diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index c285e40c1028939a19c0c956fe14bc96f91c29be..a998576e9db9f2790eea10f4aeb0956e6349f7c1 100644 (file)
--- a/src/OBJECT/SMESH_Actor.cxx
+++ b/src/OBJECT/SMESH_Actor.cxx
@@ -366,8 +366,10 @@ SMESH_ActorDef::SMESH_ActorDef()
 
   myPickableActor = myBaseActor;
 
-  myMapper = VTKViewer_DataSetMapper::New();
-  myMapper->SetInput( myPickableActor->GetUnstructuredGrid() );
+  // VSR 13/07/2011: Revert back previous fix for issue 0020749 since it causes regressions, see issues 0021322, 0021323
+  // To be removed later or fix to be improved
+  //myMapper = VTKViewer_DataSetMapper::New();
+  //myMapper->SetInput( myPickableActor->GetUnstructuredGrid() );
 
   myHighlightProp = vtkProperty::New();
   myHighlightProp->SetAmbient(1.0);
@@ -631,7 +633,9 @@ SMESH_ActorDef::~SMESH_ActorDef()
 
   myImplicitBoolean->Delete();
 
-  myMapper->Delete();
+  // VSR 13/07/2011: Revert back previous fix for issue 0020749 since it causes regressions, see issues 0021322, 0021323
+  // To be removed later or fix to be improved
+  //myMapper->Delete();
 
   myTimeStamp->Delete();
 }
@@ -1171,7 +1175,10 @@ void SMESH_ActorDef::ShallowCopy(vtkProp *prop){
 
 
 vtkMapper* SMESH_ActorDef::GetMapper(){
-  return myMapper;
+  // VSR 13/07/2011: Revert back previous fix for issue 0020749 since it causes regressions, see issues 0021322, 0021323
+  // To be removed later or fix to be improved
+  //return myMapper;
+  return myPickableActor->GetMapper();
 }