Merge remote-tracking branch 'origin/changeWx28to30' into vtk7itk4wx3

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / wxVtkSceneManager.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
index d3a984fd1d769db64b240ded0d7e98f60d2e8758..da3ade5f481a8fdeb5ef20030b390c7f6619f007 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
@@ -213,7 +213,15 @@ void wxVtkSceneManager::configureBaseView()
                        aPolygon->GetPointIds());
        aPolygonGrid->SetPoints(_pts);
        _aPolygonMapper = vtkDataSetMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _aPolygonMapper->SetInput(aPolygonGrid);
+#else
+       _aPolygonMapper->SetInputData(aPolygonGrid);
+#endif
+
+
        _fillObjectActor->SetMapper(_aPolygonMapper);
        _fillObjectActor->GetProperty()->SetColor(PORTFILL_NH_R, PORTFILL_NH_G,
                        PORTFILL_NH_B);