From 69730c96772efc6237c3c4890427dae856a0ddb9 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Wed, 8 Oct 2014 12:18:53 +0200 Subject: 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. --- intern/opencolorio/ocio_impl_glsl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern') 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)) { -- cgit v1.2.3