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/windowmanager | |
| parent | cf921934b1a6a30461779e26d67d02d0b66bdafc (diff) | |
OpenGL: rename simple shader to basic shader.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 0ac26e7d883..f7f2487e49c 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -105,7 +105,7 @@ #include "ED_util.h" #include "ED_view3d.h" -#include "GPU_simple_shader.h" +#include "GPU_basic_shader.h" #include "GPU_material.h" #include "RNA_access.h" @@ -4180,7 +4180,7 @@ static void radial_control_paint_tex(RadialControl *rc, float radius, float alph } /* draw textured quad */ - GPU_simple_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR); + GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR); glBegin(GL_QUADS); glTexCoord2f(0, 0); glVertex2f(-radius, -radius); @@ -4191,7 +4191,7 @@ static void radial_control_paint_tex(RadialControl *rc, float radius, float alph glTexCoord2f(0, 1); glVertex2f(-radius, radius); glEnd(); - GPU_simple_shader_bind(GPU_SHADER_USE_COLOR); + GPU_basic_shader_bind(GPU_SHADER_USE_COLOR); /* undo rotation */ if (rc->rot_prop) |