Merged changes in the trunk up to revision 31880.

2010-09-11 11:16:55 +00:00
parent b1da4cfcd8 38669bd5fd
commit fdb4b0c3ed
167 changed files with 8569 additions and 7064 deletions
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -170,6 +170,8 @@ void BPy_init_modules( void )
 	BPY_rna_init();

 	PyModule_AddObject( mod, "types", BPY_rna_types() ); /* needs to be first so bpy_types can run */
+	PyModule_AddObject(mod, "StructMetaIDProp", (PyObject *)&pyrna_struct_meta_idprop_Type); /* metaclass for idprop types, bpy_types.py needs access */
+			
 	bpy_import_test("bpy_types");
 	PyModule_AddObject( mod, "data", BPY_rna_module() ); /* imports bpy_types by running this */
 	bpy_import_test("bpy_types");