split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.

no functional changes.

20 files changed, 54 insertions, 15 deletions

diff --git a/source/blender/python/generic/IDProp.c b/source/blender/python/generic/IDProp.c
index cb98ed0fd6b..801b9b8e6b8 100644
--- a/source/blender/python/generic/IDProp.c
+++ b/source/blender/python/generic/IDProp.c
@@ -24,11 +24,13 @@
  */
 
 #include "IDProp.h"
+#include "MEM_guardedalloc.h"
+
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_idprop.h"
 #include "BKE_utildefines.h"
-#include "BLI_string.h"
-#include "MEM_guardedalloc.h"
 
 #define USE_STRING_COERCE
 
diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index f1c2451dace..1c9a38cf150 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -35,6 +35,8 @@
 #include <GL/glew.h>
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 static char Method_Buffer_doc[] =
diff --git a/source/blender/python/generic/blf_py_api.c b/source/blender/python/generic/blf_py_api.c
index 380f2e456bd..3d645ab8482 100644
--- a/source/blender/python/generic/blf_py_api.c
+++ b/source/blender/python/generic/blf_py_api.c
@@ -26,6 +26,9 @@
 #include "blf_py_api.h"
 
 #include "../../blenfont/BLF_api.h"
+
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 static char py_blf_position_doc[] =
diff --git a/source/blender/python/generic/bpy_internal_import.c b/source/blender/python/generic/bpy_internal_import.c
index ac7f83c6563..99fca64238c 100644
--- a/source/blender/python/generic/bpy_internal_import.c
+++ b/source/blender/python/generic/bpy_internal_import.c
@@ -27,22 +27,26 @@
 */
 
 #include <Python.h>
+#include <stddef.h>
+
 #include "compile.h"	/* for the PyCodeObject */
 #include "eval.h"		/* for PyEval_EvalCode */
 
 #include "bpy_internal_import.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_text_types.h"
 
-#include "MEM_guardedalloc.h"
+#include "BLI_listbase.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h" /* UNUSED */	
 #include "BKE_text.h" /* txt_to_buf */	
 #include "BKE_main.h"
 #include "BKE_global.h" /* grr, only for G.main->name */
-#include "BLI_listbase.h"
-#include "BLI_path_util.h"
-#include "BLI_string.h"
-#include <stddef.h>
 
 static Main *bpy_import_main= NULL;
 
diff --git a/source/blender/python/generic/mathutils.c b/source/blender/python/generic/mathutils.c
index d307d1008a7..137e27f948a 100644
--- a/source/blender/python/generic/mathutils.c
+++ b/source/blender/python/generic/mathutils.c
@@ -72,6 +72,7 @@
 #include "mathutils.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 
diff --git a/source/blender/python/generic/mathutils_color.c b/source/blender/python/generic/mathutils_color.c
index 989821510de..07838d3d938 100644
--- a/source/blender/python/generic/mathutils_color.c
+++ b/source/blender/python/generic/mathutils_color.c
@@ -25,6 +25,8 @@
 #include "mathutils.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 #define COLOR_SIZE 3
diff --git a/source/blender/python/generic/mathutils_euler.c b/source/blender/python/generic/mathutils_euler.c
index 0474d30d29f..ae0923f544e 100644
--- a/source/blender/python/generic/mathutils_euler.c
+++ b/source/blender/python/generic/mathutils_euler.c
@@ -29,6 +29,8 @@
 #include "mathutils.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 #ifndef int32_t
diff --git a/source/blender/python/generic/mathutils_geometry.c b/source/blender/python/generic/mathutils_geometry.c
index 9678a97c563..1764dbc330b 100644
--- a/source/blender/python/generic/mathutils_geometry.c
+++ b/source/blender/python/generic/mathutils_geometry.c
@@ -30,14 +30,16 @@
 #include "mathutils_geometry.h"
 
 /* Used for PolyFill */
-#include "BKE_displist.h"
 #include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
+#include "BLI_boxpack2d.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
  
+#include "BKE_displist.h"
 #include "BKE_utildefines.h"
 #include "BKE_curve.h"
-#include "BLI_boxpack2d.h"
-#include "BLI_math.h"
 
 #define SWAP_FLOAT(a,b,tmp) tmp=a; a=b; b=tmp
 #define eps 0.000001
diff --git a/source/blender/python/generic/mathutils_matrix.c b/source/blender/python/generic/mathutils_matrix.c
index 5d3c4aa821d..6994ace0f30 100644
--- a/source/blender/python/generic/mathutils_matrix.c
+++ b/source/blender/python/generic/mathutils_matrix.c
@@ -27,9 +27,11 @@
 
 #include "mathutils.h"
 
-#include "BKE_utildefines.h"
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_utildefines.h"
 
 /* matrix vector callbacks */
 int mathutils_matrix_vector_cb_index= -1;
diff --git a/source/blender/python/generic/mathutils_quat.c b/source/blender/python/generic/mathutils_quat.c
index 4dced9aaad1..d6053f3fae4 100644
--- a/source/blender/python/generic/mathutils_quat.c
+++ b/source/blender/python/generic/mathutils_quat.c
@@ -29,6 +29,8 @@
 #include "mathutils.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 #define QUAT_SIZE 4
diff --git a/source/blender/python/generic/mathutils_vector.c b/source/blender/python/generic/mathutils_vector.c
index 7bf8eebb12d..d2319c0e38e 100644
--- a/source/blender/python/generic/mathutils_vector.c
+++ b/source/blender/python/generic/mathutils_vector.c
@@ -28,8 +28,10 @@
 #include "mathutils.h"
 
 #include "BLI_blenlib.h"
-#include "BKE_utildefines.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_utildefines.h"
 
 #define MAX_DIMENSIONS 4
 /* Swizzle axes get packed into a single value that is used as a closure. Each
diff --git a/source/blender/python/generic/noise.c b/source/blender/python/generic/noise.c
index 7293cb91d45..860ba8edf21 100644
--- a/source/blender/python/generic/noise.c
+++ b/source/blender/python/generic/noise.c
@@ -38,6 +38,8 @@
 #include "structseq.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 #include "DNA_texture_types.h"
 
 #include "BKE_utildefines.h"
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 3dc9183f014..b6f92c63cb8 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -35,6 +35,7 @@
 
 #include "BLI_path_util.h"
 #include "BLI_bpath.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_global.h" /* XXX, G.main only */
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c
index 0db8ea0f317..682986befef 100644
--- a/source/blender/python/intern/bpy_app.c
+++ b/source/blender/python/intern/bpy_app.c
@@ -25,6 +25,7 @@
 #include "bpy_app.h"
 
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_blender.h"
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 3e3e946ae86..c01263a7e25 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -30,6 +30,8 @@
 
 #include <Python.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "bpy.h"
 #include "bpy_rna.h"
 #include "bpy_util.h"
@@ -37,10 +39,10 @@
 #include "DNA_space_types.h"
 #include "DNA_text_types.h"
 
-#include "MEM_guardedalloc.h"
 #include "BLI_path_util.h"
 #include "BLI_math_base.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_context.h"
diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c
index de71d7d27a4..d5446b11349 100644
--- a/source/blender/python/intern/bpy_operator.c
+++ b/source/blender/python/intern/bpy_operator.c
@@ -32,6 +32,8 @@
 #include "bpy_rna.h" /* for setting arg props only - pyrna_py_to_prop() */
 #include "bpy_util.h"
 
+#include "BLI_utildefines.h"
+
 #include "RNA_enum_types.h"
 
 #include "WM_api.h"
diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c
index fa1aeacbc42..12c67f9e03f 100644
--- a/source/blender/python/intern/bpy_operator_wrap.c
+++ b/source/blender/python/intern/bpy_operator_wrap.c
@@ -27,6 +27,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "RNA_define.h"
 
 #include "bpy_rna.h"
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c
index 1148b9e5e2b..ce63d58559f 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -26,6 +26,8 @@
 #include "bpy_rna.h"
 #include "bpy_util.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 #include "RNA_define.h" /* for defining our own rna */
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 881d71d811f..d9b2915c2c4 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -21,16 +21,17 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+#include <float.h> /* FLT_MIN/MAX */
 
 #include "bpy_rna.h"
 #include "bpy_props.h"
 #include "bpy_util.h"
 #include "bpy_rna_callback.h"
-//#include "blendef.h"
+
 #include "BLI_dynstr.h"
 #include "BLI_string.h"
 #include "BLI_listbase.h"
-#include "float.h" /* FLT_MIN/MAX */
+#include "BLI_utildefines.h"
 
 #include "RNA_enum_types.h"
 #include "RNA_define.h" /* RNA_def_property_free_identifier */
diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c
index 633ee070d9a..7973cbbc5f8 100644
--- a/source/blender/python/intern/bpy_rna_callback.c
+++ b/source/blender/python/intern/bpy_rna_callback.c
@@ -26,6 +26,8 @@
 #include "bpy_rna.h"
 #include "bpy_util.h"
 
+#include "BLI_utildefines.h"
+
 #include "DNA_screen_types.h"
 #include "BKE_utildefines.h"
 #include "BKE_context.h"