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

fix for compiler error, probably unlikely but if 'v' is NULL it could crash.

Browse Source
This commit is contained in:
Campbell Barton
2010-01-15 17:19:01 +00:00
parent 1b580dde6e
commit 2aaee044e5
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,7 +214,7 @@ static void wm_gesture_draw_circle(wmWindow *win, wmGesture *gt)
static void draw_filled_lasso(wmGesture *gt)
{
EditVert *v, *lastv=NULL, *firstv=NULL;
EditVert *v=NULL, *lastv=NULL, *firstv=NULL;
EditEdge *e;
EditFace *efa;
short *lasso= (short *)gt->customdata;
@@ -230,21 +230,24 @@ static void draw_filled_lasso(wmGesture *gt)
if (firstv==NULL) firstv = v;
}
BLI_addfilledge(firstv, v);
BLI_edgefill(0, 0);
/* highly unlikely this will fail, but could crash if (gt->points == 0) */
if(firstv) {
BLI_addfilledge(firstv, v);
BLI_edgefill(0, 0);
glEnable(GL_BLEND);
glColor4f(1.0, 1.0, 1.0, 0.05);
glBegin(GL_TRIANGLES);
for (efa = fillfacebase.first; efa; efa=efa->next) {
glVertex2f(efa->v1->co[0], efa->v1->co[1]);
glVertex2f(efa->v2->co[0], efa->v2->co[1]);
glVertex2f(efa->v3->co[0], efa->v3->co[1]);
glEnable(GL_BLEND);
glColor4f(1.0, 1.0, 1.0, 0.05);
glBegin(GL_TRIANGLES);
for (efa = fillfacebase.first; efa; efa=efa->next) {
glVertex2f(efa->v1->co[0], efa->v1->co[1]);
glVertex2f(efa->v2->co[0], efa->v2->co[1]);
glVertex2f(efa->v3->co[0], efa->v3->co[1]);
}
glEnd();
glDisable(GL_BLEND);
BLI_end_edgefill();
}
glEnd();
glDisable(GL_BLEND);
BLI_end_edgefill();
}
static void wm_gesture_draw_lasso(wmWindow *win, wmGesture *gt)