diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-06 00:11:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-06 21:35:15 +0300 |
| commit | 4aab21f9be6ed0598279cfd0086181a99c28b50e (patch) | |
| tree | d5378eb1ef12e7ff042923af4395a76312519e4d /source/blender/gpu/intern/gpu_buffers.c | |
| parent | cf921934b1a6a30461779e26d67d02d0b66bdafc (diff) | |
OpenGL: rename simple shader to basic shader.
Diffstat (limited to 'source/blender/gpu/intern/gpu_buffers.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index efbd4c1afda..3c44811324c 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -57,7 +57,7 @@ #include "GPU_buffers.h" #include "GPU_draw.h" -#include "GPU_simple_shader.h" +#include "GPU_basic_shader.h" #include "bmesh.h" @@ -1844,8 +1844,8 @@ void GPU_draw_pbvh_buffers(GPU_PBVH_Buffers *buffers, DMSetMaterial setMaterial, glEnableClientState(GL_COLOR_ARRAY); /* weak inspection of bound options, should not be necessary ideally */ - bound_options = GPU_simple_shader_bound_options(); - GPU_simple_shader_bind(bound_options | GPU_SHADER_USE_COLOR); + bound_options = GPU_basic_shader_bound_options(); + GPU_basic_shader_bind(bound_options | GPU_SHADER_USE_COLOR); } GPU_buffer_bind(buffers->vert_buf, GPU_BINDING_ARRAY); @@ -1925,7 +1925,7 @@ void GPU_draw_pbvh_buffers(GPU_PBVH_Buffers *buffers, DMSetMaterial setMaterial, if (!wireframe) { glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_COLOR_ARRAY); - GPU_simple_shader_bind(bound_options); + GPU_basic_shader_bind(bound_options); } } } |