Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarley Acheson <harley.acheson@gmail.com>2019-12-07 00:10:30 +0300
committerHarley Acheson <harley.acheson@gmail.com>2019-12-07 00:10:30 +0300
commit7c2217cd126a97df9b1c305f79a605f25c06a229 (patch)
tree4033f2c2e3ecc35bd82c610e408762dac722afe0 /source/blender/windowmanager/intern/wm_init_exit.c
parenta05b79e96d79757d5ad3fca95a766f4134b9368e (diff)
UI: File Browser Volumes and System Lists Icons
Allows each File Browser list item in Volumes and System to use individual icons. Differential Revision: https://developer.blender.org/D5802 Reviewed by Julian Eisel
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
-rw-r--r--source/blender/windowmanager/intern/wm_init_exit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index a6d3adacc14..42433c9f843 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -261,7 +261,6 @@ void WM_init(bContext *C, int argc, const char **argv)
ED_spacetypes_init(); /* editors/space_api/spacetype.c */
- ED_file_init(); /* for fsmenu */
ED_node_init_butfuncs();
BLF_init();
@@ -306,6 +305,9 @@ void WM_init(bContext *C, int argc, const char **argv)
/* Call again to set from userpreferences... */
BLT_lang_set(NULL);
+ /* For fsMenu. Called here so can include user preference paths if needed. */
+ ED_file_init();
+
/* That one is generated on demand, we need to be sure it's clear on init. */
IMB_thumb_clear_translations();