griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct assert failure in debug mode with lasso select

Browse Source 
Just do early output and don't bother with any GLSL program bind when
there is not enough points of lasso to draw.

This could have happened at the very beginning of the stroke.
This commit is contained in:
Sergey Sharybin
2017-03-15 14:01:30 +01:00
parent c16796089c
commit c10fbc002b
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -400,6 +400,16 @@ static void wm_gesture_draw_lasso(wmWindow *win, wmGesture *gt, bool filled)
draw_filled_lasso(win, gt);
}
numverts = gt->points;
if (gt->type == WM_GESTURE_LASSO) {
numverts++;
}
/* Nothing to drawe, do early output. */
if(numverts < 2) {
return;
}
VertexFormat* format = immVertexFormat();
unsigned pos = add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
unsigned line_origin = add_attrib(format, "line_origin", COMP_F32, 2, KEEP_FLOAT);
@@ -415,11 +425,6 @@ static void wm_gesture_draw_lasso(wmWindow *win, wmGesture *gt, bool filled)
immUniform1f("dash_width", 2.0f);
immUniform1f("dash_width_on", 1.0f);
numverts = gt->points;
if (gt->type == WM_GESTURE_LASSO) {
numverts++;
}
immBegin(PRIM_LINE_STRIP, numverts);
for (i = 0; i < gt->points; i++, lasso += 2) {
@@ -441,7 +446,7 @@ static void wm_gesture_draw_lasso(wmWindow *win, wmGesture *gt, bool filled)
}
immEnd();
immUnbindProgram();
}