blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Fix opengl error when GLSL is on for basic shader: shader needs to be 

bound before setting uniforms
This commit is contained in:
Antonis Ryakiotakis 2015-12-28 20:51:38 +01:00
parent d346ed3b10
commit 49a30112d4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/gpu/intern/gpu_basic_shader.c
View File

@ -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;
}