diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index c382af03c4a..2f87e5789fe 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -223,10 +223,6 @@ static void sound_jack_sync_callback(Main *bmain, int mode, double time) } } -/** - * Initialize Blender and load the startup file & preferences - * (only called once). - */ void WM_init(bContext *C, int argc, const char **argv) { @@ -318,9 +314,9 @@ void WM_init(bContext *C, int argc, const char **argv) NULL, ¶ms_file_read_post); - /* NOTE: leave `G_MAIN->name` set to an empty string since this + /* NOTE: leave `G_MAIN->filepath` set to an empty string since this * matches behavior after loading a new file. */ - BLI_assert(G_MAIN->name[0] == '\0'); + BLI_assert(G_MAIN->filepath[0] == '\0'); /* Call again to set from preferences. */ BLT_lang_set(NULL); @@ -432,10 +428,6 @@ static int wm_exit_handler(bContext *C, const wmEvent *event, void *userdata) return WM_UI_HANDLER_BREAK; } -/** - * Cause a delayed #WM_exit() - * call to avoid leaking memory when trying to exit from within operators. - */ void wm_exit_schedule_delayed(const bContext *C) { /* What we do here is a little bit hacky, but quite simple and doesn't require bigger @@ -449,9 +441,6 @@ void wm_exit_schedule_delayed(const bContext *C) WM_event_add_mousemove(win); /* ensure handler actually gets called */ } -/** - * \note doesn't run exit() call #WM_exit() for that. - */ void WM_exit_ex(bContext *C, const bool do_python) { wmWindowManager *wm = C ? CTX_wm_manager(C) : NULL; @@ -547,6 +536,7 @@ void WM_exit_ex(bContext *C, const bool do_python) RE_engines_exit(); ED_preview_free_dbase(); /* frees a Main dbase, before BKE_blender_free! */ + ED_preview_restart_queue_free(); ED_assetlist_storage_exit(); if (wm) { @@ -655,11 +645,6 @@ void WM_exit_ex(bContext *C, const bool do_python) BKE_tempdir_session_purge(); } -/** - * \brief Main exit function to close Blender ordinarily. - * \note Use #wm_exit_schedule_delayed() to close Blender from an operator. - * Might leak memory otherwise. - */ void WM_exit(bContext *C) { WM_exit_ex(C, true); @@ -677,10 +662,6 @@ void WM_exit(bContext *C) exit(G.is_break == true); } -/** - * Needed for cases when operators are re-registered - * (when operator type pointers are stored). - */ void WM_script_tag_reload(void) { UI_interface_tag_script_reload(); |