diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-12-28 22:51:38 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-12-28 22:51:38 +0300 |
commit | 49a30112d4226f5e4861cafb3c1a1b9e010c4668 (patch) | |
tree | 5ac1e3b2adcc698fae660af04f1a2d7ba330b530 | |
parent | d346ed3b105f830f5f1862054ca233d27afe28d5 (diff) |
Fix opengl error when GLSL is on for basic shader: shader needs to be
bound before setting uniforms
-rw-r--r-- | source/blender/gpu/intern/gpu_basic_shader.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_basic_shader.c b/source/blender/gpu/intern/gpu_basic_shader.c index c01d5321fe3..8a365893192 100644 --- a/source/blender/gpu/intern/gpu_basic_shader.c +++ b/source/blender/gpu/intern/gpu_basic_shader.c @@ -362,8 +362,11 @@ static GPUShader *gpu_basic_shader(int options) if (shader) { /* set texture map to first texture unit */ - if (options & GPU_SHADER_TEXTURE_2D) + if (options & GPU_SHADER_TEXTURE_2D) { + GPU_shader_bind(shader); glUniform1i(GPU_shader_get_uniform(shader, "texture_map"), 0); + GPU_shader_unbind(); + } GPU_MATERIAL_STATE.cached_shaders[options] = shader; } |