diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-09-01 19:08:32 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-09-01 19:08:32 +0400 |
| commit | 981f7fcd0d315abb425bf34dd37f7cd4d9e8d55e (patch) | |
| tree | 70800c93ec1a12579c32874e2a72eaf3290eba8e /source/blender/windowmanager/intern/wm_init_exit.c | |
| parent | 5b91a783cf0ec132398a2767d3419d675e5126b5 (diff) | |
| parent | 2365c64014b3e067bb212b2061f1d14c1f944090 (diff) | |
merge with trunk r39834
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 52a80ffa92b..7bbfce19c12 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -117,7 +117,7 @@ static void wm_free_reports(bContext *C) BKE_reports_clear(CTX_wm_reports(C)); } -int wm_start_with_console = 0; +int wm_start_with_console = 0; /* used in creator.c */ /* only called once, for startup */ void WM_init(bContext *C, int argc, const char **argv) @@ -139,7 +139,8 @@ void WM_init(bContext *C, int argc, const char **argv) RNA_types_init_gettext(); wm_operatortype_init(); - + WM_menutype_init(); + set_free_windowmanager_cb(wm_close_and_free); /* library.c */ set_blender_test_break_cb(wm_window_testbreak); /* blender.c */ DAG_editors_update_cb(ED_render_id_flush_update); /* depsgraph.c */ |