[Bf-blender-cvs] [6d71169478] blender2.8: De-duplictae fix for lasso with Dalai
Sergey Sharybin
noreply at git.blender.org
Wed Mar 15 14:18:42 CET 2017
Commit: 6d71169478d19a709b7bf5e34dfd904ab6591edf
Author: Sergey Sharybin
Date: Wed Mar 15 14:17:52 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB6d71169478d19a709b7bf5e34dfd904ab6591edf
De-duplictae fix for lasso with Dalai
Git silently merged our both fixes together. Sure thing it's double safe this way, but cmon.
===================================================================
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 da490f793b..d4bbc4c7a6 100644
--- a/source/blender/windowmanager/intern/wm_gesture.c
+++ b/source/blender/windowmanager/intern/wm_gesture.c
@@ -414,10 +414,6 @@ static void wm_gesture_draw_lasso(wmWindow *win, wmGesture *gt, bool filled)
unsigned pos = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
unsigned line_origin = add_attrib(format, "line_origin", COMP_F32, 2, KEEP_FLOAT);
- if (gt->points + (gt->type == WM_GESTURE_LASSO ? 1 : 0) < 2) {
- return;
- }
-
immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_COLOR);
immUniform4f("color1", 0.4f, 0.4f, 0.4f, 1.0f);
More information about the Bf-blender-cvs
mailing list