blender
/
blender
127
395
Fork 566
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

remove GPU_basic_shader calls from wm_gesture 

Gestures are drawn with specific built-in shaders now.
This commit is contained in:
Mike Erwin 2017-02-28 15:27:50 -05:00
parent 7b1e5e8620
commit 2a8dd3c5ff
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/windowmanager/intern/wm_gesture.c
View File

@ -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);