2011-09-20 15:17:24 +00:00
parent f5bb22d088
commit da88486c0b
3 changed files with 27 additions and 8 deletions
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -241,7 +241,7 @@ void BPY_python_start(int argc, const char **argv)
 	
 	pyrna_alloc_types();

-	BPY_atexit_init(); /* this can init any time */
+	BPY_atexit_register(); /* this can init any time */

 #ifndef WITH_PYTHON_MODULE
 	py_tstate= PyGILState_GetThisThreadState();
@@ -262,6 +262,8 @@ void BPY_python_end(void)

 	bpy_intern_string_exit();

+	BPY_atexit_unregister(); /* without this we get recursive calls to WM_exit */
+
 	Py_Finalize();
 	
 #ifdef TIME_PY_RUN