merge with 2.5/trunk at r23271

2009-09-16 17:43:09 +00:00
parent 6b0679a399
commit deebf4f8f0
686 changed files with 43627 additions and 31602 deletions
--- a/source/blender/python/intern/bpy_util.h
+++ b/source/blender/python/intern/bpy_util.h
@@ -50,8 +50,6 @@ void PyObSpit(char *name, PyObject *var);
 void PyLineSpit(void);
 void BPY_getFileAndNum(char **filename, int *lineno);

-PyObject *Py_CmpToRich(int op, int cmp);
-
 PyObject *BPY_exception_buffer(void);

 /* own python like utility function */