[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48400] branches/soc-2012-swiss_cheese/ source/blender/gpu: Fiddling with header files, last commit probably wouldn 't compile if GPU_functions.h was included outside of the GPU project.

[Jason Wilkins]

Revision: 48400
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48400
Author:   jwilkins
Date:     2012-06-29 11:27:58 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Fiddling with header files, last commit probably wouldn't compile if GPU_functions.h was included outside of the GPU project.

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_inline.h

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h	2012-06-29 11:19:29 UTC (rev 48399)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/GPU_functions.h	2012-06-29 11:27:58 UTC (rev 48400)
@@ -30,7 +30,7 @@
 #ifndef GPU_FUNCTIONS_H
 #define GPU_FUNTCIONS_H
 
-#include "gpu_immediate_internal.h" /* XXX: temporary, will re-factor header files later */
+#include "intern/gpu_immediate.h" /* XXX: temporary, will re-factor header files later */
 
 
 
@@ -225,6 +225,8 @@
 
 void GPU_func_comp_init(void);
 
+
+
 #ifdef __cplusplus
 }
 #endif

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h	2012-06-29 11:19:29 UTC (rev 48399)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h	2012-06-29 11:27:58 UTC (rev 48400)
@@ -40,8 +40,10 @@
 
 #include <stdlib.h>
 
+#include "BLI_utildefines.h"
 
 
+
 /* Are restricted pointers available? (C99) */
 #if (__STDC_VERSION__ < 199901L)
 	/* Not a C99 compiler */

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_inline.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_inline.h	2012-06-29 11:19:29 UTC (rev 48399)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_inline.h	2012-06-29 11:27:58 UTC (rev 48400)
@@ -34,7 +34,6 @@
 
 #include "gpu_immediate.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_math_base.h"
 
 #include <limits.h>