diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index e08d0afb906..6300d2ed3c7 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -54,6 +54,7 @@ #include "BLO_writefile.h" #include "BKE_blender.h" +#include "BKE_blender_undo.h" #include "BKE_context.h" #include "BKE_screen.h" #include "BKE_DerivedMesh.h" @@ -492,10 +493,10 @@ void WM_exit_ext(bContext *C, const bool do_python) RE_FreeAllRender(); RE_engines_exit(); - ED_preview_free_dbase(); /* frees a Main dbase, before free_blender! */ + ED_preview_free_dbase(); /* frees a Main dbase, before BKE_blender_free! */ if (C && wm) - wm_free_reports(C); /* before free_blender! - since the ListBases get freed there */ + wm_free_reports(C); /* before BKE_blender_free! - since the ListBases get freed there */ BKE_sequencer_free_clipboard(); /* sequencer.c */ BKE_tracking_clipboard_free(); @@ -506,7 +507,7 @@ void WM_exit_ext(bContext *C, const bool do_python) COM_deinitialize(); #endif - free_blender(); /* blender.c, does entire library and spacetypes */ + BKE_blender_free(); /* blender.c, does entire library and spacetypes */ // free_matcopybuf(); ANIM_fcurves_copybuf_free(); ANIM_drivers_copybuf_free(); @@ -534,10 +535,10 @@ void WM_exit_ext(bContext *C, const bool do_python) /* option not to close python so we can use 'atexit' */ if (do_python) { /* XXX - old note */ - /* before free_blender so py's gc happens while library still exists */ + /* before BKE_blender_free so py's gc happens while library still exists */ /* needed at least for a rare sigsegv that can happen in pydrivers */ - /* Update for blender 2.5, move after free_blender because blender now holds references to PyObject's + /* Update for blender 2.5, move after BKE_blender_free because blender now holds references to PyObject's * so decref'ing them after python ends causes bad problems every time * the pyDriver bug can be fixed if it happens again we can deal with it then */ BPY_python_end(); @@ -562,7 +563,7 @@ void WM_exit_ext(bContext *C, const bool do_python) ED_file_exit(); /* for fsmenu */ UI_exit(); - BKE_userdef_free(); + BKE_blender_userdef_free(); RNA_exit(); /* should be after BPY_python_end so struct python slots are cleared */ |