diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-22 11:55:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-22 11:55:16 +0300 |
| commit | 0e70feab22fd0871d61a03b43c591fb300990de7 (patch) | |
| tree | f95ce4dba82bd23b21dc5987be1babc4e0475fb1 /source/blender/windowmanager/intern/wm_init_exit.c | |
| parent | 91b768ccb1f42461668cea61fd1d72d64ab1d14a (diff) | |
| parent | 32d66889e992a82f3e56c0d43b06c0f4a89a08f7 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 719544403dd..fb7b6078c5f 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -236,7 +236,10 @@ void WM_init(bContext *C, int argc, const char **argv) ED_node_init_butfuncs(); BLF_init(); + BLT_lang_init(); + /* Must call first before doing any .blend file reading, since versionning code may create new IDs... See T57066. */ + BLT_lang_set(NULL); /* Init icons before reading .blend files for preview icons, which can * get triggered by the depsgraph. This is also done in background mode @@ -252,6 +255,7 @@ void WM_init(bContext *C, int argc, const char **argv) /* get the default database, plus a wm */ wm_homefile_read(C, NULL, G.factory_startup, false, true, NULL, WM_init_state_app_template_get()); + /* Call again to set from userpreferences... */ BLT_lang_set(NULL); if (!G.background) { |