From 4e7d555c52a7e6225669bc323eda5e8c1d30d32d Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 2 Aug 2011 16:46:04 +0000
Subject: [PATCH] fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@4065 51575b47-30f0-44d4-a5cc-537603b46e54
---
 .../tome/data/gfx/talents/golemancy_life_tap.png | Bin 0 -> 4837 bytes
 src/main.c                                       |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 game/modules/tome/data/gfx/talents/golemancy_life_tap.png

diff --git a/game/modules/tome/data/gfx/talents/golemancy_life_tap.png b/game/modules/tome/data/gfx/talents/golemancy_life_tap.png
new file mode 100644
index 0000000000000000000000000000000000000000..f89dfcba9730cbd085864fd3fc100a614f791a8e
GIT binary patch
literal 4837
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
LNkvXXu0mjfjH+9W

literal 0
HcmV?d00001

diff --git a/src/main.c b/src/main.c
index ba7f86dfbf..9020605fe1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -683,10 +683,10 @@ void do_resize(int w, int h, bool fullscreen)
 			printf("error opening screen: %s\n", SDL_GetError());
 			exit(1);
 		}
-		glewInit();
 		screen = SDL_GetWindowSurface(window);
 		maincontext = SDL_GL_CreateContext(window);
 		SDL_GL_MakeCurrent(window, maincontext);
+		glewInit();
 	}
 	else
 	{
@@ -949,6 +949,7 @@ int main(int argc, char *argv[])
 		shaders_active = FALSE;
 		fbo_active = FALSE;
 	}
+	printf("===fbo %d\n", fbo_active);
 
 //	setupDisplayTimer(30);
 	init_blank_surface();
-- 
GitLab