[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17988] branches/blender2.5/blender/source /blender/python/intern: 2.5

[Ton Roosendaal]

Revision: 17988
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17988
Author:   ton
Date:     2008-12-21 11:56:14 +0100 (Sun, 21 Dec 2008)

Log Message:
-----------
2.5

New Python code: Fixes for Makefile and compat hacks for py 2.3 
Campbell should check though!

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/python/intern/Makefile
    branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
    branches/blender2.5/blender/source/blender/python/intern/bpy_idprop.c

Modified: branches/blender2.5/blender/source/blender/python/intern/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/Makefile	2008-12-21 10:52:57 UTC (rev 17987)
+++ branches/blender2.5/blender/source/blender/python/intern/Makefile	2008-12-21 10:56:14 UTC (rev 17988)
@@ -55,6 +55,7 @@
 CPPFLAGS += -I../../nodes
 CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I../../blenloader
+CPPFLAGS += -I../../windowmanager
 CPPFLAGS += -I../../render/extern/include
 
 # path to the guarded memory allocator

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h	2008-12-21 10:52:57 UTC (rev 17987)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h	2008-12-21 10:56:14 UTC (rev 17988)
@@ -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__ */

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_idprop.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_idprop.c	2008-12-21 10:52:57 UTC (rev 17987)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_idprop.c	2008-12-21 10:56:14 UTC (rev 17988)
@@ -30,6 +30,7 @@
 #include "BKE_idprop.h"
 
 #include "bpy_idprop.h"
+#include "bpy_compat.h"
 
 #include "MEM_guardedalloc.h"