From: rnv <rnv@opencascade.com>
Date: Wed, 10 Aug 2016 14:20:04 +0000 (+0300)
Subject: Start potring to the VTK OpenGL2 backend.
X-Git-Tag: V8_1_0rc1~3^2^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=379b43513cb5b8b86fa98b27f85e5d7079536fc5;p=modules%2Fgeom.git

Start potring to the VTK OpenGL2 backend.
---

diff --git a/src/OBJECT/GEOM_PainterPolyDataMapper.h b/src/OBJECT/GEOM_PainterPolyDataMapper.h
index 02d23b23f..0ec8875f8 100644
--- a/src/OBJECT/GEOM_PainterPolyDataMapper.h
+++ b/src/OBJECT/GEOM_PainterPolyDataMapper.h
@@ -20,17 +20,32 @@
 #ifndef GEOM_PAINTERPOLYDATAMAPPER_H 
 #define GEOM_PAINTERPOLYDATAMAPPER_H 
 
+#ifndef VTK_OPENGL2
 #include <vtkPainterPolyDataMapper.h>
+#else
+#include <vtkPolyDataMapper.h>
+#endif
 
 /*
  * This class can be used to prevent drawing of mappers' content (due to an
  * empty definition of GEOM_PainterPolyDataMapper::RenderPiece(...) method).
  * It is used as poly data mapper in GEOM_Actor class.
  */
-class GEOM_PainterPolyDataMapper: public vtkPainterPolyDataMapper
+class GEOM_PainterPolyDataMapper:
+#ifndef VTK_OPENGL2
+public vtkPainterPolyDataMapper
+#else
+public vtkPolyDataMapper
+#endif
 {
  public:
+#ifndef VTK_OPENGL2
   vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPainterPolyDataMapper);
+#else
+  vtkTypeMacro(GEOM_PainterPolyDataMapper,vtkPolyDataMapper);
+#endif
+
+
   static GEOM_PainterPolyDataMapper* New();
 
   virtual void RenderPiece(vtkRenderer *ren, vtkActor *act) {}