diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-02-28 23:27:50 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-02-28 23:30:39 +0300 |
| commit | 2a8dd3c5ff5bd58411ee6a00d8a9087ce98941e0 (patch) | |
| tree | a076b2de68bb9c5f74373c672c79a1f85492806b /source/blender/windowmanager/intern/wm_gesture.c | |
| parent | 7b1e5e86202b1f4cf6305c422ca8519e912c1511 (diff) | |
remove GPU_basic_shader calls from wm_gesture
Gestures are drawn with specific built-in shaders now.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_gesture.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index e95d5cbc2ed..b7a34b329b7 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -45,7 +45,6 @@ #include "BKE_context.h" - #include "WM_api.h" #include "WM_types.h" @@ -53,9 +52,7 @@ #include "wm_subwindow.h" #include "wm_draw.h" -#include "GPU_basic_shader.h" #include "GPU_immediate.h" -#include "GPU_shader.h" #include "BIF_glutil.h" @@ -381,11 +378,9 @@ static void draw_filled_lasso(wmWindow *win, wmGesture *gt) immDrawPixelsTex(rect.xmin, rect.ymin, w, h, GL_RED, GL_UNSIGNED_BYTE, GL_NEAREST, pixel_buf, 1.0f, 1.0f, NULL); GPU_shader_unbind(); - GPU_basic_shader_bind(GPU_SHADER_USE_COLOR); glPixelStorei(GL_UNPACK_ALIGNMENT, 4); - MEM_freeN(pixel_buf); glDisable(GL_BLEND); @@ -496,8 +491,8 @@ static void wm_gesture_draw_cross(wmWindow *win, wmGesture *gt) void wm_gesture_draw(wmWindow *win) { wmGesture *gt = (wmGesture *)win->gesture.first; - - GPU_basic_shader_line_width(1); + + glLineWidth(1.0f); for (; gt; gt = gt->next) { /* all in subwindow space */ wmSubWindowSet(win, gt->swinid); |