blender
/
blender
134
399
Fork 583
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

Fix OpenGL error on cycles rendered viewport. 

We queried the wrong value when looking for the bound 2D texture. This
is not totally robust because currently bound texture may not be a 2D
one, but this should work for now.
This commit is contained in:
Antonis Ryakiotakis 2014-10-08 12:18:53 +02:00
parent 7a76b1a003
commit e1ef451996
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/opencolorio/ocio_impl_glsl.cc
View File

@ -260,7 +260,7 @@ bool OCIOImpl::setupGLSLDraw(OCIO_GLSLDrawState **state_r, OCIO_ConstProcessorRc
*state_r = allocateOpenGLState();
state = *state_r;
glGetIntegerv(GL_TEXTURE_2D, &state->last_texture);
glGetIntegerv(GL_TEXTURE_BINDING_2D, &state->last_texture);
glGetIntegerv(GL_ACTIVE_TEXTURE, &state->last_texture_unit);
if (!ensureLUT3DAllocated(state)) {