Merged changes in the trunk up to revision 29409.

[blender.git] / source / blender / python / intern / bpy.c

diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 4fd601a191fd55499beef82d2a60ab77478903ec..4cb88ec9f688d9d4560ea05a4c90f487f9b0b167 100644 (file)
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -143,6 +143,7 @@ static void bpy_import_test(char *modname)
 void BPy_init_modules( void )
 {
        extern BPy_StructRNA *bpy_context_module;
+       PointerRNA ctx_ptr;
        PyObject *mod;
 
        /* Needs to be first since this dir is needed for future modules */
@@ -184,9 +185,12 @@ void BPy_init_modules( void )
        PyModule_AddObject( mod, "app", BPY_app_struct() );
 
        /* bpy context */
-       bpy_context_module= ( BPy_StructRNA * ) PyObject_NEW( BPy_StructRNA, &pyrna_struct_Type );
-       RNA_pointer_create(NULL, &RNA_Context, BPy_GetContext(), &bpy_context_module->ptr);
-       bpy_context_module->freeptr= 0;
+       RNA_pointer_create(NULL, &RNA_Context, BPy_GetContext(), &ctx_ptr);
+       bpy_context_module= (BPy_StructRNA *)pyrna_struct_CreatePyObject(&ctx_ptr);
+       /* odd that this is needed, 1 ref on creation and another for the module
+        * but without we get a crash on exit */
+       Py_INCREF(bpy_context_module);
+
        PyModule_AddObject(mod, "context", (PyObject *)bpy_context_module);
 
        /* utility func's that have nowhere else to go */