2.5

Moved GPU init to the right location, it has to be called per
window you open. Now rip and add-window gives good views. :)

2 files changed, 4 insertions, 1 deletions

diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index d8448be30ab..c55cd631a40 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -139,7 +139,6 @@ void WM_init(bContext *C)
 	
 // XXX	UI_filelist_init_icons();
 	
-	GPU_state_init();
 	GPU_extensions_init();
 	
 	read_Blog();
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 0dca5804f26..8d660230714 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -55,6 +55,8 @@
 
 #include "ED_screen.h"
 
+#include "GPU_draw.h"
+
 /* the global to talk to ghost */
 GHOST_SystemHandle g_system= NULL;
 
@@ -215,6 +217,8 @@ static void wm_window_add_ghostwindow(wmWindowManager *wm, char *title, wmWindow
 		
 		/* standard state vars for window */
 		glEnable(GL_SCISSOR_TEST);
+		
+		GPU_state_init();
 	}
 }