svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-11 00:19:13 +00:00
parent bcdd9d236c fab1ee1f78
commit 0f329ebdf1
38 changed files with 209 additions and 99 deletions
--- a/source/blender/python/generic/IDProp.c
+++ b/source/blender/python/generic/IDProp.c
@@ -45,12 +45,6 @@
 #include "py_capi_utils.h"
 #endif

-PyObject *		PyC_UnicodeFromByte(const char *str);
-const char *	PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce); /* coerce must be NULL */
-
-/*** Function to wrap ID properties ***/
-PyObject *BPy_Wrap_IDProperty(ID *id, IDProperty *prop, IDProperty *parent);
-
 extern PyTypeObject IDArray_Type;
 extern PyTypeObject IDGroup_Iter_Type;