diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-05-15 23:18:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-15 23:21:26 +0300 |
commit | 80c009721004b1d436c1892ed4705592c8dd63b0 (patch) | |
tree | 5259b8387544c038f87eee14c468e9c7dc8e258e | |
parent | b931afe55e4f07e8d1d92cc2049467a96a0c5345 (diff) |
Only initialize icons in background mode.
Also enable this for headless builds too.
Calling UI_icons_init would initialize matcaps, brushes etc...
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 7c05d5f4378..420af1e2e71 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -889,11 +889,9 @@ int UI_icon_get_height(int icon_id) void UI_icons_init(int first_dyn_id) { -#ifdef WITH_HEADLESS - (void)first_dyn_id; -#else - init_iconfile_list(&iconfilelist); BKE_icons_init(first_dyn_id); +#ifndef WITH_HEADLESS + init_iconfile_list(&iconfilelist); init_internal_icons(); init_brush_icons(); init_matcap_icons(); diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 8778929ae08..c7544f21372 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -58,6 +58,7 @@ #include "BKE_screen.h" #include "BKE_DerivedMesh.h" #include "BKE_global.h" +#include "BKE_icons.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_mball_tessellate.h" @@ -179,11 +180,17 @@ void WM_init(bContext *C, int argc, const char **argv) GPU_set_linear_mipmap(true); GPU_set_anisotropic(U.anisotropic_filter); GPU_set_gpu_mipmapping(U.use_gpu_mipmap); + + UI_init(); + } + else { + /* Note: Currently only inits icons, which we now want in background mode too + * (scripts could use those in background processing...). + * In case we do more later, we may need to pass a 'background' flag. + * Called from 'UI_init' above */ + BKE_icons_init(1); } - /* Note: Currently only inits icons, which we now want in background mode too (scripts could use those in background - * processing...). In case we do more later, we may need to pass a 'background' flag. */ - UI_init(); ED_spacemacros_init(); |