From: ouv <ouv@opencascade.com>
Date: Thu, 21 Feb 2013 14:31:51 +0000 (+0000)
Subject: Porting to VTK 6.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_PORTING_VTK6;p=modules%2Fgeom.git

Porting to VTK 6.
Debug.
---

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 73caf9f34..c0f0ebea4 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -1629,7 +1629,7 @@ void GeometryGUI::onViewManagerRemoved( SUIT_ViewManager* vm )
       if ( GEOMGUI_OCCSelector* sr = itOCCSel.next() )
         if ( sr->viewer() == viewer )
         {
-          delete myOCCSelectors.takeAt( myOCCSelectors.indexOf( sr ) );
+          /*delete*/ myOCCSelectors.takeAt( myOCCSelectors.indexOf( sr ) );
           break;
         }
   }
@@ -1640,7 +1640,7 @@ void GeometryGUI::onViewManagerRemoved( SUIT_ViewManager* vm )
       if ( LightApp_VTKSelector* sr = itVTKSel.next() )
         if ( sr->viewer() == viewer )
         {
-          delete myVTKSelectors.takeAt( myVTKSelectors.indexOf( sr ) );
+          /*delete*/ myVTKSelectors.takeAt( myVTKSelectors.indexOf( sr ) );
           break;
         }
   }
diff --git a/src/OBJECT/GEOM_DeviceActor.cxx b/src/OBJECT/GEOM_DeviceActor.cxx
index cd43d4d2e..3c09b57ce 100755
--- a/src/OBJECT/GEOM_DeviceActor.cxx
+++ b/src/OBJECT/GEOM_DeviceActor.cxx
@@ -54,7 +54,11 @@ GEOM_DeviceActor::
 SetInput(vtkAlgorithmOutput* thePolyData, bool theUseStripper)
 { 
   if(theUseStripper)
+  {
     myPolyDataNormals->SetInputConnection(thePolyData); 
+    myStripper->SetInputConnection(myPolyDataNormals->GetOutputPort()); 
+    myPolyDataMapper->SetInputConnection(myStripper->GetOutputPort()); 
+  }
   else 
     myPolyDataMapper->SetInputConnection(thePolyData); 
 }