From 8f21a43535cb200c0569566a1b012aec883aa53c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Jan 2011 18:36:47 +0000 Subject: 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. --- source/blender/python/generic/IDProp.c | 6 ++++-- source/blender/python/generic/bgl.c | 2 ++ source/blender/python/generic/blf_py_api.c | 3 +++ source/blender/python/generic/bpy_internal_import.c | 14 +++++++++----- source/blender/python/generic/mathutils.c | 1 + source/blender/python/generic/mathutils_color.c | 2 ++ source/blender/python/generic/mathutils_euler.c | 2 ++ source/blender/python/generic/mathutils_geometry.c | 8 +++++--- source/blender/python/generic/mathutils_matrix.c | 4 +++- source/blender/python/generic/mathutils_quat.c | 2 ++ source/blender/python/generic/mathutils_vector.c | 4 +++- source/blender/python/generic/noise.c | 2 ++ 12 files changed, 38 insertions(+), 12 deletions(-) (limited to 'source/blender/python/generic') 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 #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 +#include + #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 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" -- cgit v1.2.3