Merged changes in the trunk up to revision 26409.

2010-01-30 02:58:48 +00:00
parent 972650d983 ada9ca9687
commit 2d8ee7efa3
294 changed files with 6032 additions and 3786 deletions
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -220,7 +220,9 @@ static void bpy_init_modules( void )
 	/* bpy context */
 	{
 		bpy_context_module= ( BPy_StructRNA * ) PyObject_NEW( BPy_StructRNA, &pyrna_struct_Type );
+
 		RNA_pointer_create(NULL, &RNA_Context, NULL, &bpy_context_module->ptr);
+		bpy_context_module->freeptr= 0;

 		PyModule_AddObject(mod, "context", (PyObject *)bpy_context_module);
 	}