diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-31 03:08:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-31 03:08:53 +0400 |
| commit | 7267221715d8431bd1aaaaa3ace4f8c0ce151627 (patch) | |
| tree | 65f85d299db27f35ec67330e58864f1dcf088687 /source/blender/editors/space_clip | |
| parent | bced18155ffc525dc513d097245fe3954acbb900 (diff) | |
remove return argument from wmOperatorType->cancel, was only ever returning OPERATOR_CANCELLED.
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index a76f4364492..9aa6eab7fc8 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -159,12 +159,10 @@ static void open_init(bContext *C, wmOperator *op) uiIDContextProperty(C, &pprop->ptr, &pprop->prop); } -static int open_cancel(bContext *UNUSED(C), wmOperator *op) +static void open_cancel(bContext *UNUSED(C), wmOperator *op) { MEM_freeN(op->customdata); op->customdata = NULL; - - return OPERATOR_CANCELLED; } static int open_exec(bContext *C, wmOperator *op) @@ -444,11 +442,9 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -static int view_pan_cancel(bContext *C, wmOperator *op) +static void view_pan_cancel(bContext *C, wmOperator *op) { - view_pan_exit(C, op, 1); - - return OPERATOR_CANCELLED; + view_pan_exit(C, op, true); } void CLIP_OT_view_pan(wmOperatorType *ot) @@ -578,11 +574,9 @@ static int view_zoom_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -static int view_zoom_cancel(bContext *C, wmOperator *op) +static void view_zoom_cancel(bContext *C, wmOperator *op) { - view_zoom_exit(C, op, 1); - - return OPERATOR_CANCELLED; + view_zoom_exit(C, op, true); } void CLIP_OT_view_zoom(wmOperatorType *ot) |