diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-10-08 14:18:53 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-10-08 14:19:06 +0400 |
| commit | e1ef4519961ad80ff4643246e14c73173d913c22 (patch) | |
| tree | 71ec205294bc470934defdc01435623dc5a56b6a | |
| parent | 7a76b1a003271ebb2f2dae348726992d85fbbb53 (diff) | |
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.
| -rw-r--r-- | intern/opencolorio/ocio_impl_glsl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index 62290a325b4..de89ea72f3c 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -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)) { |