diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-05 18:58:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-05 18:58:12 +0400 |
| commit | ea61c7426287c28ae6b0cbb04419d6e2f7aaa663 (patch) | |
| tree | e4c69a13ba4ffada20609b614e37ba9d11aacf1b /source/blender/python | |
| parent | 6b0c7c1e59ddb1ab5afbb9b3ccb078c73bf676ee (diff) | |
hopefully fixes building on msvc, also some minor header edits
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/intern/bpy.c | 5 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_util.h | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index ad900343704..3ed662f41d7 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -32,6 +32,9 @@ #include <Python.h> +#include "RNA_types.h" +#include "RNA_access.h" + #include "bpy.h" #include "bpy_util.h" #include "bpy_rna.h" @@ -49,8 +52,6 @@ #include "BKE_global.h" /* XXX, G.main only */ #include "BKE_blender.h" -#include "RNA_access.h" - #include "MEM_guardedalloc.h" /* external util modules */ diff --git a/source/blender/python/intern/bpy_util.h b/source/blender/python/intern/bpy_util.h index 13fbf6a16b9..6aa50cf88de 100644 --- a/source/blender/python/intern/bpy_util.h +++ b/source/blender/python/intern/bpy_util.h @@ -24,7 +24,6 @@ * \ingroup pythonintern */ - #ifndef __BPY_UTIL_H__ #define __BPY_UTIL_H__ @@ -33,12 +32,13 @@ #endif #if PY_VERSION_HEX < 0x03030000 -# warning "Python 3.2 will be deprecated soon, upgrade to Python 3.3." +# ifdef _MSC_VER +# pragma message("Python 3.2 will be deprecated soon, upgrade to Python 3.3.") +# else +# warning "Python 3.2 will be deprecated soon, upgrade to Python 3.3." +# endif #endif - -#include "RNA_types.h" /* for EnumPropertyItem only */ - struct EnumPropertyItem; struct ReportList; @@ -56,4 +56,5 @@ void BPy_SetContext(struct bContext *C); extern void bpy_context_set(struct bContext *C, PyGILState_STATE *gilstate); extern void bpy_context_clear(struct bContext *C, PyGILState_STATE *gilstate); -#endif + +#endif /* __BPY_UTIL_H__ */ |