[Bf-blender-cvs] [2a8dd3c5ff] blender2.8: remove GPU_basic_shader calls from wm_gesture

Mike Erwin noreply at git.blender.org
Tue Feb 28 21:32:31 CET 2017


Commit: 2a8dd3c5ff5bd58411ee6a00d8a9087ce98941e0
Author: Mike Erwin
Date:   Tue Feb 28 15:27:50 2017 -0500
Branches: blender2.8
https://developer.blender.org/rB2a8dd3c5ff5bd58411ee6a00d8a9087ce98941e0

remove GPU_basic_shader calls from wm_gesture

Gestures are drawn with specific built-in shaders now.

===================================================================

M	source/blender/windowmanager/intern/wm_gesture.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c
index e95d5cbc2e..b7a34b329b 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);




More information about the Bf-blender-cvs mailing list