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 675c18408861263d57156b7e04305fc6b14681ff..47f10044b1bbb26366691073e72921f4ef9f497e 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.cxx
+++ b/src/SVTK/SVTK_DeviceActor.cxx
@@ -621,21 +621,24 @@ void
 SVTK_DeviceActor
 ::Render(vtkRenderer *ren, vtkMapper* m)
 {
-  if(myIsResolveCoincidentTopology){
-    int aResolveCoincidentTopology = vtkMapper::GetResolveCoincidentTopology();
-    double aFactor, aUnit; 
-    vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
-    
-    vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
-    vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor,
-                                                                   myPolygonOffsetUnits);
-    Superclass::Render(ren,m);
-    
-    vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
-    vtkMapper::SetResolveCoincidentTopology(aResolveCoincidentTopology);
-  }else{
-    Superclass::Render(ren,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);
   }
+  
+  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 f68d23d851ba75e245f430a65872a0d5733588d6..2080fe6d7f5b9a7fbc9a8d4b62b6874ad1931332 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Actor.cxx
+++ b/src/VTKViewer/VTKViewer_Actor.cxx
@@ -218,21 +218,24 @@ VTKViewer_Actor
       SetNumberOfCloudPoints(aNbOfPoints);
   }
 
-  if(myIsResolveCoincidentTopology){
-    int aResolveCoincidentTopology = vtkMapper::GetResolveCoincidentTopology();
-    double aFactor, aUnit; 
-    vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
+  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);
+  }
     
-    vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
-    vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor,
-                                                                   myPolygonOffsetUnits);
-    Superclass::Render(ren,m);
+  vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
+  vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aNewFactor,
+                                                                aNewUnit);
+  Superclass::Render(ren,m);
     
-    vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
-    vtkMapper::SetResolveCoincidentTopology(aResolveCoincidentTopology);
-  }else{
-    Superclass::Render(ren,m);
-  }
+  vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
+  vtkMapper::SetResolveCoincidentTopology(aResolveCoincidentTopology);
 }
 
 /*!