diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-15 20:19:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-15 20:19:01 +0300 |
| commit | 2aaee044e565f1123b812d1a0350bfb5ac5e1de4 (patch) | |
| tree | a540106b2794fa55453b2b588372a0a6e21bb1b9 /source/blender/windowmanager | |
| parent | 1b580dde6e633056c1a9f0436b778dc2797ef469 (diff) | |
fix for compiler error, probably unlikely but if 'v' is NULL it could crash.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 80d6869067a..958832ce314 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -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]); - } - glEnd(); - glDisable(GL_BLEND); + 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(); + BLI_end_edgefill(); + } } static void wm_gesture_draw_lasso(wmWindow *win, wmGesture *gt) |