diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-11-28 03:20:28 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-06 21:35:15 +0300 |
| commit | cf921934b1a6a30461779e26d67d02d0b66bdafc (patch) | |
| tree | ea6e1a6618628f11a4114ecb47cfd94acc005939 /source/blender/editors/space_clip/clip_draw.c | |
| parent | 147f7a1e860587a928f465b0b4d0ecf816c997be (diff) | |
OpenGL: use simple shader for texture drawing in a few places.
Differential Revision: https://developer.blender.org/D1645
Diffstat (limited to 'source/blender/editors/space_clip/clip_draw.c')
| -rw-r--r-- | source/blender/editors/space_clip/clip_draw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 848883aacc1..2d7367885ca 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -58,6 +58,8 @@ #include "BIF_gl.h" #include "BIF_glutil.h" +#include "GPU_simple_shader.h" + #include "WM_types.h" #include "UI_interface.h" @@ -1085,7 +1087,7 @@ static void draw_plane_marker_image(Scene *scene, glColor4f(1.0, 1.0, 1.0, plane_track->image_opacity); - glEnable(GL_TEXTURE_2D); + GPU_simple_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR); glGenTextures(1, (GLuint *)&texid); glBindTexture(GL_TEXTURE_2D, texid); @@ -1109,7 +1111,7 @@ static void draw_plane_marker_image(Scene *scene, glPopMatrix(); glBindTexture(GL_TEXTURE_2D, 0); - glDisable(GL_TEXTURE_2D); + GPU_simple_shader_bind(GPU_SHADER_USE_COLOR); if (transparent) { glDisable(GL_BLEND); |