archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

crash fix for recent commit

Browse Source
This commit is contained in:
Campbell Barton
2009-10-26 09:35:33 +00:00
parent 21757e1161
commit 47f80e026e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_view3d/view3d_select.c
View File

@@ -699,7 +699,7 @@ void view3d_lasso_select(bContext *C, ViewContext *vc, short mcords[][2], short
{ {
Object *ob = CTX_data_active_object(C); Object *ob = CTX_data_active_object(C);
if(vc->obedit==NULL) { if(vc->obedit==NULL) { /* Object Mode */
if(paint_facesel_test(ob)) if(paint_facesel_test(ob))
do_lasso_select_facemode(vc, mcords, moves, select); 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)) else if(ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))
@@ -709,9 +709,10 @@ void view3d_lasso_select(bContext *C, ViewContext *vc, short mcords[][2], short
else else
do_lasso_select_objects(vc, mcords, moves, select); do_lasso_select_objects(vc, mcords, moves, select);
} }
else if(vc->obedit->type==OB_MESH) { else { /* Edit Mode */
if(vc->obedit->type==OB_MESH)
do_lasso_select_mesh(vc, mcords, moves, select); do_lasso_select_mesh(vc, mcords, moves, select);
} else if(vc->obedit->type==OB_CURVE || vc->obedit->type==OB_SURF) else if(vc->obedit->type==OB_CURVE || vc->obedit->type==OB_SURF)
do_lasso_select_curve(vc, mcords, moves, select); do_lasso_select_curve(vc, mcords, moves, select);
else if(vc->obedit->type==OB_LATTICE) else if(vc->obedit->type==OB_LATTICE)
do_lasso_select_lattice(vc, mcords, moves, select); do_lasso_select_lattice(vc, mcords, moves, select);
@@ -720,6 +721,7 @@ void view3d_lasso_select(bContext *C, ViewContext *vc, short mcords[][2], short
WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc->obedit->data); WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc->obedit->data);
} }
}
/* lasso operator gives properties, but since old code works /* lasso operator gives properties, but since old code works