Merge branch 'master' of github.com:supertuxkart/stk-code

2015-04-02 10:50:22 +11:00
parent 3f76b0c68d 6af71fe582
commit 4135ed4be2
1 changed files with 3 additions and 0 deletions
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -30,6 +30,9 @@ extern "C" {
 #    include <OpenGL/gl3.h>
 #    define OGL32CTX
 #    ifdef GL_ARB_instanced_arrays
+#        ifdef glVertexAttribDivisor
+#            undef glVertexAttribDivisor
+#        endif
 #        define glVertexAttribDivisor glVertexAttribDivisorARB
 #    endif
 #    ifndef GL_TEXTURE_SWIZZLE_RGBA