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/editors/space_sequencer | |
parent | cf921934b1a6a30461779e26d67d02d0b66bdafc (diff) |
OpenGL: rename simple shader to basic shader.
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 925804b8bb4..deb0a3f6d03 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -58,7 +58,7 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "GPU_simple_shader.h" +#include "GPU_basic_shader.h" #include "ED_anim_api.h" #include "ED_gpencil.h" @@ -1296,7 +1296,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq glColor4f(1.0, 1.0, 1.0, 1.0); - GPU_simple_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR); + GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR); glGenTextures(1, (GLuint *)&texid); glBindTexture(GL_TEXTURE_2D, texid); @@ -1371,7 +1371,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq glEnd(); glBindTexture(GL_TEXTURE_2D, 0); - GPU_simple_shader_bind(GPU_SHADER_USE_COLOR); + GPU_basic_shader_bind(GPU_SHADER_USE_COLOR); if (sseq->mainb == SEQ_DRAW_IMG_IMBUF && sseq->flag & SEQ_USE_ALPHA) glDisable(GL_BLEND); glDeleteTextures(1, &texid); |