diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-26 12:35:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-26 12:35:33 +0300 |
| commit | 47f80e026e9d38b84ada36dd59edeadb4c899f7c (patch) | |
| tree | 59e9e3d22abce3fc8d61f2bd666a73f0faa76b3f /source/blender/editors/space_view3d/view3d_select.c | |
| parent | 21757e1161441f58726bd8ba8d67010fbcfcfe7d (diff) | |
crash fix for recent commit
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 1f186f0d931..b13d83c0157 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -699,7 +699,7 @@ void view3d_lasso_select(bContext *C, ViewContext *vc, short mcords[][2], short { Object *ob = CTX_data_active_object(C); - if(vc->obedit==NULL) { + if(vc->obedit==NULL) { /* Object Mode */ if(paint_facesel_test(ob)) do_lasso_select_facemode(vc, mcords, moves, select); else if(ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)) @@ -709,16 +709,18 @@ void view3d_lasso_select(bContext *C, ViewContext *vc, short mcords[][2], short else do_lasso_select_objects(vc, mcords, moves, select); } - else if(vc->obedit->type==OB_MESH) { - do_lasso_select_mesh(vc, mcords, moves, select); - } else if(vc->obedit->type==OB_CURVE || vc->obedit->type==OB_SURF) - do_lasso_select_curve(vc, mcords, moves, select); - else if(vc->obedit->type==OB_LATTICE) - do_lasso_select_lattice(vc, mcords, moves, select); - else if(vc->obedit->type==OB_ARMATURE) - do_lasso_select_armature(vc, mcords, moves, select); - - WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc->obedit->data); + else { /* Edit Mode */ + if(vc->obedit->type==OB_MESH) + do_lasso_select_mesh(vc, mcords, moves, select); + else if(vc->obedit->type==OB_CURVE || vc->obedit->type==OB_SURF) + do_lasso_select_curve(vc, mcords, moves, select); + else if(vc->obedit->type==OB_LATTICE) + do_lasso_select_lattice(vc, mcords, moves, select); + else if(vc->obedit->type==OB_ARMATURE) + do_lasso_select_armature(vc, mcords, moves, select); + + WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc->obedit->data); + } } |