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

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;
 

source/blender/python/intern/bpy_library.c

@@ -76,7 +76,7 @@ static void bpy_lib_dealloc(BPy_Library *self)
 }
 
 
-PyTypeObject bpy_lib_Type= {
+static PyTypeObject bpy_lib_Type= {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"bpy_lib",		/* tp_name */
 	sizeof(BPy_Library),			/* tp_basicsize */

source/blender/python/intern/bpy_operator.c

@@ -36,6 +36,7 @@
 
 #include "RNA_types.h"
 
+#include "BPY_extern.h"
 #include "bpy_operator.h"
 #include "bpy_operator_wrap.h"
 #include "bpy_rna.h" /* for setting arg props only - pyrna_py_to_prop() */

source/blender/python/intern/bpy_rna.h

@@ -187,12 +187,8 @@ int pyrna_write_check(void);
 int pyrna_struct_validity_check(BPy_StructRNA *pysrna);
 int pyrna_prop_validity_check(BPy_PropertyRNA *self);
 
-void BPY_modules_update(struct bContext *C); //XXX temp solution
-
 /* bpy.utils.(un)register_class */
 extern PyMethodDef meth_bpy_register_class;
 extern PyMethodDef meth_bpy_unregister_class;
 
-void BPY_id_release(struct ID *id);
-
 #endif