From 14080e602ad02605c97f8db71164b5c7aee8623c Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Sun, 20 Jul 2014 18:18:35 -0400
Subject: [PATCH] Code in previous commit was incorrect, no idea why it even
 compiled for me

---
 src/graphics/shaders.cpp |  2 +-
 src/graphics/shaders.hpp | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 782cf0163..b160b3d6b 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -28,7 +28,7 @@
 
 using namespace video;
 
-GLuint UniformHelper::getUniformLocation(GLuint program, const char* name)
+GLuint getUniformLocation(GLuint program, const char* name)
 {
     return glGetUniformLocation(program, name);
 }
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index f7246e2bf..407643328 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -56,8 +56,6 @@ void glUniform1fWrapper(GLuint, float);
 
 struct UniformHelper
 {
-    GLuint getUniformLocation(GLuint program, const char* name);
-
     template<unsigned N = 0>
     static void setUniformsHelper(const std::vector<GLuint> &uniforms)
     {
@@ -105,6 +103,7 @@ struct UniformHelper
 };
 
 void bypassUBO(GLuint Program);
+GLuint getUniformLocation(GLuint program, const char* name);
 
 template<typename... Args>
 class ShaderHelper
@@ -114,13 +113,13 @@ protected:
 
     void AssignUniforms(const char* name)
     {
-        uniforms.push_back(UniformHelper::getUniformLocation(Program, name));
+        uniforms.push_back(getUniformLocation(Program, name));
     }
 
     template<typename... T>
     void AssignUniforms(const char* name, T... rest)
     {
-        uniforms.push_back(UniformHelper::getUniformLocation(Program, name));
+        uniforms.push_back(getUniformLocation(Program, name));
         AssignUniforms(rest...);
     }
 
@@ -143,13 +142,13 @@ protected:
     
     void AssignUniforms(const char* name)
     {
-        uniforms.push_back(UniformHelper::getUniformLocation(Program, name));
+        uniforms.push_back(getUniformLocation(Program, name));
     }
 
     template<typename... U>
     void AssignUniforms(const char* name, U... rest)
     {
-        uniforms.push_back(UniformHelper::getUniformLocation(Program, name));
+        uniforms.push_back(getUniformLocation(Program, name));
         AssignUniforms(rest...);
     }