diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-15 12:28:56 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-15 12:28:56 +0400 |
| commit | 40981d872f0410caf1870194c8e15ebaed864dea (patch) | |
| tree | adde4556e99bbc684580f028c1d962369d9f2676 /source/blender/windowmanager/intern/wm_init_exit.c | |
| parent | 68c8aecb465bf0c8e229c50958dc004bde7407b3 (diff) | |
| parent | 81946b9138201800e495eb28addf254958feb1a4 (diff) | |
merge from trunk r37405
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 4acf5157ff1..583518a4eac 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -126,7 +126,6 @@ void WM_init(bContext *C, int argc, const char **argv) wm_init_cursor_data(); } GHOST_CreateSystemPaths(); - BLF_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */ BLF_lang_init(); // use default settings @@ -134,15 +133,15 @@ void WM_init(bContext *C, int argc, const char **argv) BLF_lang_set(""); wm_operatortype_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 */ - + ED_spacetypes_init(); /* editors/space_api/spacetype.c */ - + ED_file_init(); /* for fsmenu */ - ED_init_node_butfuncs(); + ED_init_node_butfuncs(); /* get the default database, plus a wm */ WM_read_homefile(C, NULL, G.factory_startup); |