Commit a55f7415 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'compile_fixes'

69a266c6

 Fix some recent compile issues
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Reviewed-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !404
parents fa7a62fc 69a266c6
......@@ -13,10 +13,6 @@
=========================================================================*/
#ifdef VTKGL2
# include "vtk_glew.h"
#endif
#include "vtkCompositeRGBAPass.h"
#include "vtkObjectFactory.h"
#include <cassert>
......@@ -52,7 +48,9 @@
# include "vtkOpenGLState.h"
#endif
#ifndef VTK_OPENGL2
#ifdef VTK_OPENGL2
# include "vtk_glew.h"
#else
# include "vtkgl.h"
# include "vtkOpenGLExtensionManager.h"
#endif
......
......@@ -51,6 +51,7 @@
# include "vtkOpenGLHelper.h"
# include "vtkTextureObjectVS.h"
# include "vtkCompositeZPassFS.h"
# include "vtk_glew.h"
#else
# include "vtkgl.h"
# include "vtkShaderProgram2.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment