From 7267221715d8431bd1aaaaa3ace4f8c0ce151627 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 30 Oct 2013 23:08:53 +0000 Subject: remove return argument from wmOperatorType->cancel, was only ever returning OPERATOR_CANCELLED. --- source/blender/editors/mesh/editmesh_bevel.c | 3 +-- source/blender/editors/mesh/editmesh_inset.c | 3 +-- source/blender/editors/mesh/editmesh_knife.c | 3 +-- source/blender/editors/mesh/editmesh_loopcut.c | 9 +++++---- 4 files changed, 8 insertions(+), 10 deletions(-) (limited to 'source/blender/editors/mesh') diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 97da0047793..dd3aacb2d67 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -185,7 +185,7 @@ static void edbm_bevel_exit(bContext *C, wmOperator *op) op->customdata = NULL; } -static int edbm_bevel_cancel(bContext *C, wmOperator *op) +static void edbm_bevel_cancel(bContext *C, wmOperator *op) { BevelData *opdata = op->customdata; if (opdata->is_modal) { @@ -197,7 +197,6 @@ static int edbm_bevel_cancel(bContext *C, wmOperator *op) /* need to force redisplay or we may still view the modified result */ ED_region_tag_redraw(CTX_wm_region(C)); - return OPERATOR_CANCELLED; } /* bevel! yay!!*/ diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index eb66cf50a1e..137554459ce 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -166,7 +166,7 @@ static void edbm_inset_exit(bContext *C, wmOperator *op) MEM_freeN(op->customdata); } -static int edbm_inset_cancel(bContext *C, wmOperator *op) +static void edbm_inset_cancel(bContext *C, wmOperator *op) { InsetData *opdata; @@ -180,7 +180,6 @@ static int edbm_inset_cancel(bContext *C, wmOperator *op) /* need to force redisplay or we may still view the modified result */ ED_region_tag_redraw(CTX_wm_region(C)); - return OPERATOR_CANCELLED; } static bool edbm_inset_calc(wmOperator *op) diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 5d8851640e0..306aedaa9ec 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -3195,11 +3195,10 @@ static void knifetool_init(bContext *C, KnifeTool_OpData *kcd, } } -static int knifetool_cancel(bContext *C, wmOperator *op) +static void knifetool_cancel(bContext *C, wmOperator *op) { /* this is just a wrapper around exit() */ knifetool_exit(C, op); - return OPERATOR_CANCELLED; } static int knifetool_invoke(bContext *C, wmOperator *op, const wmEvent *event) diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 3066fb86bf8..9223f6d9450 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -418,11 +418,10 @@ static int ringsel_init(bContext *C, wmOperator *op, bool do_cut) return 1; } -static int ringcut_cancel(bContext *C, wmOperator *op) +static void ringcut_cancel(bContext *C, wmOperator *op) { /* this is just a wrapper around exit() */ ringsel_exit(C, op); - return OPERATOR_CANCELLED; } static void loopcut_update_edge(RingSelOpData *lcd, BMEdge *e, const int previewlines) @@ -549,7 +548,8 @@ static int loopcut_modal(bContext *C, wmOperator *op, const wmEvent *event) ringsel_exit(C, op); } else { - return ringcut_cancel(C, op); + ringcut_cancel(C, op); + return OPERATOR_CANCELLED; } return OPERATOR_FINISHED; @@ -569,7 +569,8 @@ static int loopcut_modal(bContext *C, wmOperator *op, const wmEvent *event) ED_region_tag_redraw(lcd->ar); ED_area_headerprint(CTX_wm_area(C), NULL); - return ringcut_cancel(C, op); + ringcut_cancel(C, op); + return OPERATOR_CANCELLED; } ED_region_tag_redraw(lcd->ar); -- cgit v1.2.3