From 81ecd3f938ee0e0d02d71f6c6c21a5c0246055d4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 8 May 2017 15:59:00 +0200 Subject: Fix OCIO shader being attmepted to be unbound twice --- source/blender/editors/screen/glutil.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/screen/glutil.c') diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 8bf269f74fa..b284800d510 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -159,6 +159,7 @@ IMMDrawPixelsTexState immDrawPixelsTexSetup(int builtin) /* Shader will be unbind by immUnbindProgram in immDrawPixelsTexScaled_clipping */ immBindBuiltinProgram(builtin); immUniform1i("image", 0); + state.do_shader_unbind = true; return state; } @@ -318,7 +319,9 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state, } } - immUnbindProgram(); + if (state->do_shader_unbind) { + immUnbindProgram(); + } glBindTexture(GL_TEXTURE_2D, 0); glPixelStorei(GL_UNPACK_ROW_LENGTH, unpack_row_length); @@ -571,6 +574,8 @@ void glaDrawImBuf_glsl_clipping(ImBuf *ibuf, float x, float y, int zoomfilter, int ok; IMMDrawPixelsTexState state = {0}; + /* We want GLSL state to be fully handled by OCIO. */ + state.do_shader_unbind = false; immDrawPixelsTexSetupAttributes(&state); if (ibuf->rect_float) { -- cgit v1.2.3