diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 13:28:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 13:28:15 +0400 |
commit | d4d80ee0a1e0e720c712ec58e30a63f7f4c005ab (patch) | |
tree | 5a98b2f659deb4ff4c192f1b3585354893954d61 | |
parent | 8623935aa838a168f64b54f4fefe472444db72fc (diff) |
rename IDProp.c/h to idprop_py_api, since it was same name as BKE idprop.c with case changed.
-rw-r--r-- | source/blender/python/generic/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/python/generic/idprop_py_api.c (renamed from source/blender/python/generic/IDProp.c) | 2 | ||||
-rw-r--r-- | source/blender/python/generic/idprop_py_api.h (renamed from source/blender/python/generic/IDProp.h) | 8 | ||||
-rw-r--r-- | source/blender/python/intern/bpy.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 847a0d19a7f..bd9731a277a 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -33,17 +33,17 @@ set(INC_SYS ) set(SRC - IDProp.c bgl.c blf_py_api.c bpy_internal_import.c + idprop_py_api.c noise_py_api.c py_capi_utils.c - IDProp.h bgl.h blf_py_api.h bpy_internal_import.h + idprop_py_api.h noise_py_api.h py_capi_utils.h ) diff --git a/source/blender/python/generic/IDProp.c b/source/blender/python/generic/idprop_py_api.c index 8da80bd99bd..30d70a39424 100644 --- a/source/blender/python/generic/IDProp.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -28,7 +28,7 @@ #include <Python.h> -#include "IDProp.h" +#include "idprop_py_api.h" #include "MEM_guardedalloc.h" #include "BLI_string.h" diff --git a/source/blender/python/generic/IDProp.h b/source/blender/python/generic/idprop_py_api.h index 36cb4c76a5c..61aad5ed3b9 100644 --- a/source/blender/python/generic/IDProp.h +++ b/source/blender/python/generic/idprop_py_api.h @@ -20,13 +20,13 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/python/generic/IDProp.h +/** \file blender/python/generic/idprop_py_api.h * \ingroup pygen */ -#ifndef IDPROP_H -#define IDPROP_H +#ifndef PY_IDPROP_API_H +#define PY_IDPROP_API_H struct ID; struct IDProperty; @@ -68,4 +68,4 @@ void IDProp_Init_Types(void); #define IDPROP_ITER_KEYS 0 #define IDPROP_ITER_ITEMS 1 -#endif /* IDPROP_H */ +#endif /* PY_IDPROP_API_H */ diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 2df907f3a12..9bb7457a1f7 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -53,7 +53,7 @@ #include "MEM_guardedalloc.h" /* external util modules */ -#include "../generic/IDProp.h" +#include "../generic/idprop_py_api.h" #include "../generic/bgl.h" #include "../generic/blf_py_api.h" #include "../mathutils/mathutils.h" diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 5ac83b8bf79..6077aa26d4c 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -73,7 +73,7 @@ #include "BKE_animsys.h" #include "BKE_fcurve.h" -#include "../generic/IDProp.h" /* for IDprop lookups */ +#include "../generic/idprop_py_api.h" /* for IDprop lookups */ #include "../generic/py_capi_utils.h" #ifdef WITH_INTERNATIONAL |