From 13c60ab0d120a652dfd832d5ac791d515d36e9d3 Mon Sep 17 00:00:00 2001 From: inv Date: Wed, 13 Jul 2011 05:03:09 +0000 Subject: [PATCH] Fix regressions 0021322, 0021323 --- src/OBJECT/SMESH_Actor.cxx | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx index c285e40c1..a998576e9 100644 --- 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(); } -- 2.30.2