diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-21 13:56:14 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-21 13:56:14 +0300 |
| commit | f44d8c2780c08fb96461daf831789c59242fcaa2 (patch) | |
| tree | 1302860abe629356001fc0090872f93ded74748a /source | |
| parent | db77f6abd7148d0548a864c5c28beab5de3c4e79 (diff) | |
2.5
New Python code: Fixes for Makefile and compat hacks for py 2.3
Campbell should check though!
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/python/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_compat.h | 9 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_idprop.c | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/python/intern/Makefile b/source/blender/python/intern/Makefile index 3d6ce51c9bd..ef4fc8bb58a 100644 --- a/source/blender/python/intern/Makefile +++ b/source/blender/python/intern/Makefile @@ -55,6 +55,7 @@ CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../nodes CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../blenloader +CPPFLAGS += -I../../windowmanager CPPFLAGS += -I../../render/extern/include # path to the guarded memory allocator diff --git a/source/blender/python/intern/bpy_compat.h b/source/blender/python/intern/bpy_compat.h index 348947b7fcb..0032b760219 100644 --- a/source/blender/python/intern/bpy_compat.h +++ b/source/blender/python/intern/bpy_compat.h @@ -55,6 +55,15 @@ /* older then python 2.5 - define these */ #if (PY_VERSION_HEX < 0x02050000) #define Py_ssize_t ssize_t +#ifndef Py_RETURN_NONE +#define Py_RETURN_NONE return Py_BuildValue("O", Py_None) +#endif +#ifndef Py_RETURN_FALSE +#define Py_RETURN_FALSE return PyBool_FromLong(0) +#endif +#ifndef Py_RETURN_TRUE +#define Py_RETURN_TRUE return PyBool_FromLong(1) +#endif #endif #endif /* BPY_COMPAT_H__ */ diff --git a/source/blender/python/intern/bpy_idprop.c b/source/blender/python/intern/bpy_idprop.c index a5fca06d402..120cc4d6ba9 100644 --- a/source/blender/python/intern/bpy_idprop.c +++ b/source/blender/python/intern/bpy_idprop.c @@ -30,6 +30,7 @@ #include "BKE_idprop.h" #include "bpy_idprop.h" +#include "bpy_compat.h" #include "MEM_guardedalloc.h" |