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:
authorBastien Montagne <montagne29@wanadoo.fr>2015-05-15 21:12:25 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-05-15 21:12:25 +0300
commitb931afe55e4f07e8d1d92cc2049467a96a0c5345 (patch)
treefac00e92f69d5c30bd5595967e4a0c877069303a /source/blender/windowmanager
parent08f30ef31c21003685a816663f41834e4c7b56ad (diff)
Fix new 'custom previews/icons' py feature crashing in background mode.
We want this even without UI, some scripts may use it in a background processing mode to avoid too heavy process in actual 'user' blender...
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_init_exit.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 77d3e3762a8..8778929ae08 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -179,10 +179,12 @@ 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();
}
+ /* 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();
/* note: there is a bug where python needs initializing before loading the