[Bf-blender-cvs] [69730c9] blender-v2.72-release: Fix OpenGL error on cycles rendered viewport.

[Antony Riakiotakis]

Commit: 69730c96772efc6237c3c4890427dae856a0ddb9
Author: Antony Riakiotakis
Date:   Wed Oct 8 12:18:53 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB69730c96772efc6237c3c4890427dae856a0ddb9

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.

===================================================================

M	intern/opencolorio/ocio_impl_glsl.cc

===================================================================

diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index 677be0b..f1df87a 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)) {