[Bf-blender-cvs] [3480409] multiview: fix for building with glew-mx

[Campbell Barton]

Commit: 3480409ae868d95b8ba7f81784866cc70e5b4578
Author: Campbell Barton
Date:   Mon Nov 24 12:38:56 2014 +0100
Branches: multiview
https://developer.blender.org/rB3480409ae868d95b8ba7f81784866cc70e5b4578

fix for building with glew-mx

(dont include GL/glew.h direct anymore)

===================================================================

M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/makesrna/intern/rna_space.c
M	source/blender/windowmanager/intern/wm_stereo.c
M	source/blender/windowmanager/wm_draw.h

===================================================================

diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index df97ee4..bdb3021 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -2618,7 +2618,6 @@ static int rna_Node_image_has_views_get(PointerRNA *ptr)
 {
 	bNode *node = (bNode *)ptr->data;
 	Image *ima = (Image *)node->id;
-	int views;
 
 	if (!ima || !(ima->rr)) return 0;
 
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 2ff78b5..a17d402 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -91,7 +91,9 @@ EnumPropertyItem space_type_items[] = {
 #define V3D_S3D_CAMERA_LEFT        {STEREO_LEFT_ID, "LEFT", ICON_RESTRICT_RENDER_OFF, "Left", ""},
 #define V3D_S3D_CAMERA_RIGHT       {STEREO_RIGHT_ID, "RIGHT", ICON_RESTRICT_RENDER_OFF, "Right", ""},
 #define V3D_S3D_CAMERA_S3D         {STEREO_3D_ID, "S3D", ICON_CAMERA_STEREO, "3D", ""},
+#ifdef RNA_RUNTIME
 #define V3D_S3D_CAMERA_VIEWS       {STEREO_MONO_ID, "MONO", ICON_RESTRICT_RENDER_OFF, "Views", ""},
+#endif
 
 static EnumPropertyItem stereo3d_camera_items[] = {
 	V3D_S3D_CAMERA_LEFT
@@ -100,11 +102,13 @@ static EnumPropertyItem stereo3d_camera_items[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
+#ifdef RNA_RUNTIME
 static EnumPropertyItem multiview_camera_items[] = {
 	V3D_S3D_CAMERA_VIEWS
 	V3D_S3D_CAMERA_S3D
 	{0, NULL, 0, NULL, NULL}
 };
+#endif
 
 #undef V3D_S3D_CAMERA_LEFT
 #undef V3D_S3D_CAMERA_RIGHT
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index 048e0ed..2398fca 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -31,7 +31,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <GL/glew.h>
 
 #include "DNA_listBase.h"
 #include "DNA_screen_types.h"
@@ -61,6 +60,7 @@
 #include "ED_view3d.h"
 #include "ED_screen.h"
 
+#include "GPU_glew.h"
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
 
diff --git a/source/blender/windowmanager/wm_draw.h b/source/blender/windowmanager/wm_draw.h
index ae2bcbd..5dc52b2 100644
--- a/source/blender/windowmanager/wm_draw.h
+++ b/source/blender/windowmanager/wm_draw.h
@@ -32,7 +32,7 @@
 #ifndef __WM_DRAW_H__
 #define __WM_DRAW_H__
 
-#include <GL/glew.h>
+#include "GPU_glew.h"
 
 
 #define MAX_N_TEX 3