diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-10-08 14:18:53 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-15 15:06:10 +0400 |
| commit | 69730c96772efc6237c3c4890427dae856a0ddb9 (patch) | |
| tree | f01524daa5453ab157e571e4a4f6142c5e0c1dc7 | |
| parent | 11bbe69b2af06b388e18999076245454cd1192fd (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 677be0bf9ed..f1df87a84a5 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)) { |