Commit 15ebce8d authored by Jan Möbius's avatar Jan Möbius

Merge branch 'fixWindowsARBCompilation' into 'master'

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

See merge request !78
parents cc2c5e8c 1697bf15
......@@ -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::activeTexture(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