[Bf-blender-cvs] [80c0097] master: Only initialize icons in background mode.

[Campbell Barton]

Commit: 80c009721004b1d436c1892ed4705592c8dd63b0
Author: Campbell Barton
Date:   Sat May 16 06:18:04 2015 +1000
Branches: master
https://developer.blender.org/rB80c009721004b1d436c1892ed4705592c8dd63b0

Only initialize icons in background mode.

Also enable this for headless builds too.

Calling UI_icons_init would initialize matcaps, brushes etc...

===================================================================

M	source/blender/editors/interface/interface_icons.c
M	source/blender/windowmanager/intern/wm_init_exit.c

===================================================================

diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 7c05d5f..420af1e 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 8778929..c7544f2 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();