Merge branch 'master' into win32

Conflicts:
	gui.h
	quadtree.cpp
	scene.cpp
	scene.h

1 files changed, 2 insertions, 0 deletions

diff --git a/gl.cpp b/gl.cpp
index 8152f05..54ab4c5 100644
--- a/gl.cpp
+++ b/gl.cpp
@@ -14,6 +14,7 @@ GLboolean (*glUnmapBuffer)(GLenum);
 /* uniform */
 GLint (*glGetUniformLocation)(GLuint, const GLchar*);
 void (*glUniform1i)(GLint, GLint);
+void (*glUniform2f)(GLint, GLfloat, GLfloat);
 void (*glUniform3f)(GLint, GLfloat, GLfloat, GLfloat);
 
 /* texture */
@@ -49,6 +50,7 @@ void win32_gl_init() {
 
 	glGetUniformLocation = (GLint(*)(GLuint, const GLchar*))SDL_GL_GetProcAddress("glGetUniformLocation");
 	glUniform1i = (void(*)(GLint, GLint))SDL_GL_GetProcAddress("glUniform1i");
+	glUniform2f = (void(*)(GLint, GLfloat, GLfloat))SDL_GL_GetProcAddress("glUniform2f");
 	glUniform3f = (void(*)(GLint, GLfloat, GLfloat, GLfloat))SDL_GL_GetProcAddress("glUniform3f");
 
 	glActiveTexture = (void(*)(GLenum))SDL_GL_GetProcAddress("glActiveTexture");