ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-28 07:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
vsr 2011-07-15 09:15:31 +00:00
parent 8d1f5fd948
commit d797740a8e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/OBJECT/SMESH_Actor.cxx
View File

@ -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();
}