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:
authorCampbell Barton <ideasman42@gmail.com>2015-05-15 23:18:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-05-15 23:21:26 +0300
commit80c009721004b1d436c1892ed4705592c8dd63b0 (patch)
tree5259b8387544c038f87eee14c468e9c7dc8e258e /source/blender/editors
parentb931afe55e4f07e8d1d92cc2049467a96a0c5345 (diff)
Only initialize icons in background mode.
Also enable this for headless builds too. Calling UI_icons_init would initialize matcaps, brushes etc...
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_icons.c6
1 files changed, 2 insertions, 4 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();