From 3ce4a58aa90d93d1d0f1ec5dcc63a482d1b1af78 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 18 Jun 2015 06:11:02 +1000 Subject: Cleanup: duplicate includes --- source/blender/python/generic/blf_py_api.c | 2 +- source/blender/python/generic/idprop_py_api.c | 2 +- source/blender/python/generic/py_capi_utils.c | 2 +- source/blender/python/intern/bpy_interface.c | 1 - source/blender/python/intern/bpy_rna.c | 4 ---- source/blender/python/mathutils/mathutils.c | 2 +- 6 files changed, 4 insertions(+), 9 deletions(-) (limited to 'source/blender/python') diff --git a/source/blender/python/generic/blf_py_api.c b/source/blender/python/generic/blf_py_api.c index ed1ac7ceed9..5364c3bbb9e 100644 --- a/source/blender/python/generic/blf_py_api.c +++ b/source/blender/python/generic/blf_py_api.c @@ -33,7 +33,7 @@ #include "BLI_utildefines.h" -#include "../generic/python_utildefines.h" +#include "python_utildefines.h" PyDoc_STRVAR(py_blf_position_doc, diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 1f35572a483..30e0ccdb106 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -41,7 +41,7 @@ #include "py_capi_utils.h" #endif -#include "../generic/python_utildefines.h" +#include "python_utildefines.h" /*********************** ID Property Main Wrapper Stuff ***************/ diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index 6443c65a50a..1b72928b26e 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -37,7 +37,7 @@ #include "py_capi_utils.h" -#include "../generic/python_utildefines.h" +#include "python_utildefines.h" /* only for BLI_strncpy_wchar_from_utf8, should replace with py funcs but too late in release now */ #include "BLI_string_utf8.h" diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 2c893c37bd6..7e5ad00159e 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -788,7 +788,6 @@ int BPY_context_member_get(bContext *C, const char *member, bContextDataResult * } #ifdef WITH_PYTHON_MODULE -#include "BLI_fileops.h" /* TODO, reloading the module isn't functional at the moment. */ static void bpy_module_free(void *mod); diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 3f6ba4cd21c..d15e3b36ced 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -52,10 +52,6 @@ #include "bpy_rna_callback.h" #include "bpy_intern_string.h" -#ifdef USE_PYRNA_INVALIDATE_WEAKREF -# include "MEM_guardedalloc.h" -#endif - #ifdef USE_PYRNA_INVALIDATE_WEAKREF # include "BLI_ghash.h" #endif diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c index 9ec5e90a493..361fbc8a005 100644 --- a/source/blender/python/mathutils/mathutils.c +++ b/source/blender/python/mathutils/mathutils.c @@ -110,7 +110,7 @@ Py_hash_t mathutils_array_hash(const float *array, size_t array_len) return x; } -/* helper functionm returns length of the 'value', -1 on error */ +/* helper function returns length of the 'value', -1 on error */ int mathutils_array_parse(float *array, int array_min, int array_max, PyObject *value, const char *error_prefix) { const int flag = array_max; -- cgit v1.2.3