[Bf-blender-cvs] [2a3a9af] ui-preview-buttons: Move again GPU init code before UI_init one (since icons use OGL, I assue they need it initiated first).
Bastien Montagne
noreply at git.blender.org
Sat May 9 12:38:26 CEST 2015
Commit: 2a3a9af1aef53ccad706a45c9d063595917d4c2d
Author: Bastien Montagne
Date: Sat May 9 12:33:41 2015 +0200
Branches: ui-preview-buttons
https://developer.blender.org/rB2a3a9af1aef53ccad706a45c9d063595917d4c2d
Move again GPU init code before UI_init one (since icons use OGL, I assue they need it initiated first).
Oddly enough this did not seem to be an issue, but...
===================================================================
M source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 04dc397..77d3e37 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -171,7 +171,15 @@ void WM_init(bContext *C, int argc, const char **argv)
wm_homefile_read(C, NULL, G.factory_startup, NULL);
BLF_lang_set(NULL);
+
if (!G.background) {
+ GPU_init();
+
+ GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
+ GPU_set_linear_mipmap(true);
+ GPU_set_anisotropic(U.anisotropic_filter);
+ GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
+
UI_init();
}
@@ -200,15 +208,6 @@ void WM_init(bContext *C, int argc, const char **argv)
wm_init_reports(C); /* reports cant be initialized before the wm */
- if (!G.background) {
- GPU_init();
-
- GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
- GPU_set_linear_mipmap(true);
- GPU_set_anisotropic(U.anisotropic_filter);
- GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
- }
-
clear_matcopybuf();
ED_render_clear_mtex_copybuf();
More information about the Bf-blender-cvs
mailing list