[Bf-blender-cvs] [e1ef451] master: Fix OpenGL error on cycles rendered viewport.

Antony Riakiotakis noreply at git.blender.org
Wed Oct 8 12:19:19 CEST 2014


Commit: e1ef4519961ad80ff4643246e14c73173d913c22
Author: Antony Riakiotakis
Date:   Wed Oct 8 12:18:53 2014 +0200
Branches: master
https://developer.blender.org/rBe1ef4519961ad80ff4643246e14c73173d913c22

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 62290a3..de89ea7 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)) {




More information about the Bf-blender-cvs mailing list