[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60268] branches/soc-2013-viewport_fx/ source/blender: creator.c doesn't like indirectly including glew.h

[Jason Wilkins]

Revision: 60268
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60268
Author:   jwilkins
Date:     2013-09-20 18:02:13 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
creator.c doesn't like indirectly including glew.h

Modified Paths:
--------------
    branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h
    branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h
    branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_window.c

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h	2013-09-20 17:59:25 UTC (rev 60267)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h	2013-09-20 18:02:13 UTC (rev 60268)
@@ -32,8 +32,6 @@
 #ifndef __GPU_DRAW_H__
 #define __GPU_DRAW_H__
 
-#include "GPU_glew.h"
-
 #include "BLI_sys_types.h"
 
 #ifdef __cplusplus
@@ -135,8 +133,6 @@
 /* Delayed free of OpenGL buffers by main thread */
 void GPU_free_unused_buffers(void);
 
-GLenum GPU_mipmap_2D(GLboolean genmip, GLenum internalFormat, int w, int h, GLenum type, void* data);
-
 #ifdef __cplusplus
 }
 #endif

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h	2013-09-20 17:59:25 UTC (rev 60267)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h	2013-09-20 18:02:13 UTC (rev 60268)
@@ -61,6 +61,8 @@
 
 const char* gpuErrorString(GLenum err);
 
+GLenum GPU_mipmap_2D(GLboolean genmip, GLenum internalFormat, int w, int h, GLenum type, void* data);
+
 #ifdef __cplusplus
 }
 #endif

Modified: branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c	2013-09-20 17:59:25 UTC (rev 60267)
+++ branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c	2013-09-20 18:02:13 UTC (rev 60268)
@@ -57,7 +57,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_colormanagement.h"
 
-#include "GPU_draw.h"
+#include "GPU_utility.h"
 #include "GPU_state_latch.h"
 
 #include "DNA_image_types.h"

Modified: branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_window.c	2013-09-20 17:59:25 UTC (rev 60267)
+++ branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_window.c	2013-09-20 18:02:13 UTC (rev 60268)
@@ -72,6 +72,7 @@
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
 #include "GPU_init_exit.h"
+#include "GPU_glew.h"
 
 #include "UI_interface.h"