Commit 17528bc2 authored by schultz's avatar schultz

fixed the compile error on windows after the ARB glCalls were renamed.

Now use GLState to make the call, as the QOpenGLFunctions header undefs
glActiveTexture.

Fixing the include order and separating gl calls from qt calls may also
work here, but not be applicable as this is a template
parent cc2c5e8c
......@@ -1447,7 +1447,7 @@ void ACG::DrawMeshT<Mesh>::addTriRenderObjects(IRenderer* _renderer, const Rende
}
else // no texture map specified, use whatever texture is currently bound to the first texture stage
{
glActiveTexture(GL_TEXTURE0);
GLState::glActiveTexture(GL_TEXTURE0);
GLint textureID = 0;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &textureID);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment