sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

inset and bevel could both be activated when there was no selection.

Browse Source
This commit is contained in:
Campbell Barton 2013-04-08 02:14:58 +00:00
parent 68239cb098
commit 45669ebbc6
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/mesh/editmesh_bevel.c
View File

@ -97,7 +97,7 @@ static int edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
BMEditMesh *em = BMEdit_FromObject(obedit); BMEditMesh *em = BMEdit_FromObject(obedit);
BevelData *opdata; BevelData *opdata;
if (em == NULL) { if (em->bm->totvertsel == 0) {
return 0; return 0;
} }

12
source/blender/editors/mesh/editmesh_inset.c
View File

@ -113,6 +113,10 @@ static int edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal)
Object *obedit = CTX_data_edit_object(C); Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit); BMEditMesh *em = BMEdit_FromObject(obedit);
if (em->bm->totvertsel == 0) {
return 0;
}
op->customdata = opdata = MEM_mallocN(sizeof(InsetData), "inset_operator_data"); op->customdata = opdata = MEM_mallocN(sizeof(InsetData), "inset_operator_data");
opdata->old_thickness = 0.01; opdata->old_thickness = 0.01;
@ -239,7 +243,9 @@ static int edbm_inset_calc(wmOperator *op)
static int edbm_inset_exec(bContext *C, wmOperator *op) static int edbm_inset_exec(bContext *C, wmOperator *op)
{ {
edbm_inset_init(C, op, false); if (!edbm_inset_init(C, op, false)) {
return OPERATOR_CANCELLED;
}
if (!edbm_inset_calc(op)) { if (!edbm_inset_calc(op)) {
edbm_inset_exit(C, op); edbm_inset_exit(C, op);
@ -257,7 +263,9 @@ static int edbm_inset_invoke(bContext *C, wmOperator *op, const wmEvent *event)
float mlen[2]; float mlen[2];
float center_3d[3]; float center_3d[3];
edbm_inset_init(C, op, true); if (!edbm_inset_init(C, op, true)) {
return OPERATOR_CANCELLED;
}
opdata = op->customdata; opdata = op->customdata;