52633: Activation of the ParaVis module leads to the breaking on the pre-selection...

diff --git a/src/SVTK/SVTK_DeviceActor.cxx b/src/SVTK/SVTK_DeviceActor.cxx
index 47f10044b1bbb26366691073e72921f4ef9f497e..d1cb768435325e97c28e7ddce359b46338281763 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.cxx
+++ b/src/SVTK/SVTK_DeviceActor.cxx
@@ -622,22 +622,20 @@ SVTK_DeviceActor
 ::Render(vtkRenderer *ren, vtkMapper* m)
 {
   int aResolveCoincidentTopology = vtkMapper::GetResolveCoincidentTopology();
-  double aFactor, aUnit; 
-  vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
-  
-  double aNewFactor = myPolygonOffsetFactor, aNewUnit = myPolygonOffsetUnits;
-  if(!myIsResolveCoincidentTopology){
-    static double EPS = .01;
-    aNewFactor *= (1.0-EPS);
-    aNewUnit *= (1.0-EPS);
+  if(myIsResolveCoincidentTopology){
+    double aFactor, aUnit; 
+    vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
+    
+    vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
+    vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor,
+                                                                   myPolygonOffsetUnits);
+    Superclass::Render(ren,m);
+    
+    vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
+  }else{
+    vtkMapper::SetResolveCoincidentTopologyToOff();
+    Superclass::Render(ren,m);
   }
-  
-  vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
-  vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aNewFactor,
-                                                                aNewUnit);
-  Superclass::Render(ren,m);
-  
-  vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
   vtkMapper::SetResolveCoincidentTopology(aResolveCoincidentTopology);
 }
 

diff --git a/src/VTKViewer/VTKViewer_Actor.cxx b/src/VTKViewer/VTKViewer_Actor.cxx
index 2080fe6d7f5b9a7fbc9a8d4b62b6874ad1931332..76df0121df2e987ffec40e361a369c628153d6f3 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Actor.cxx
+++ b/src/VTKViewer/VTKViewer_Actor.cxx
@@ -219,22 +219,20 @@ VTKViewer_Actor
   }
 
   int aResolveCoincidentTopology = vtkMapper::GetResolveCoincidentTopology();
-  double aFactor, aUnit; 
-  vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
-  
-  double aNewFactor = myPolygonOffsetFactor, aNewUnit = myPolygonOffsetUnits;
-  if(!myIsResolveCoincidentTopology){
-    static double EPS = .01;
-    aNewFactor *= (1.0-EPS);
-    aNewUnit *= (1.0-EPS);
-  }
+  if(myIsResolveCoincidentTopology){
+    double aFactor, aUnit; 
+    vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
     
-  vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
-  vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aNewFactor,
-                                                                aNewUnit);
-  Superclass::Render(ren,m);
+    vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
+    vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor,
+                                                                   myPolygonOffsetUnits);
+    Superclass::Render(ren,m);
     
-  vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
+    vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
+  }else{
+    vtkMapper::SetResolveCoincidentTopologyToOff();
+    Superclass::Render(ren,m);
+  }
   vtkMapper::SetResolveCoincidentTopology(aResolveCoincidentTopology);
 }