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/armature | |
| parent | bced18155ffc525dc513d097245fe3954acbb900 (diff) | |
remove return argument from wmOperatorType->cancel, was only ever returning OPERATOR_CANCELLED.
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/editarmature_sketch.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_lib.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_slide.c | 3 |
3 files changed, 6 insertions, 10 deletions
diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index 8ae1b9557ee..36999c15665 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -2339,7 +2339,7 @@ static int sketch_convert(bContext *C, wmOperator *UNUSED(op), const wmEvent *UN return OPERATOR_FINISHED; } -static int sketch_cancel(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event)) +static int sketch_cancel_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event)) { SK_Sketch *sketch = contextSketch(C, 0); if (sketch != NULL) { @@ -2374,12 +2374,11 @@ static int sketch_select(bContext *C, wmOperator *UNUSED(op), const wmEvent *eve return OPERATOR_FINISHED; } -static int sketch_draw_stroke_cancel(bContext *C, wmOperator *op) +static void sketch_draw_stroke_cancel(bContext *C, wmOperator *op) { SK_Sketch *sketch = contextSketch(C, 1); /* create just to be sure */ sk_cancelStroke(sketch); MEM_freeN(op->customdata); - return OPERATOR_CANCELLED; } static int sketch_draw_stroke(bContext *C, wmOperator *op, const wmEvent *event) @@ -2400,12 +2399,11 @@ static int sketch_draw_stroke(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -static int sketch_draw_gesture_cancel(bContext *C, wmOperator *op) +static void sketch_draw_gesture_cancel(bContext *C, wmOperator *op) { SK_Sketch *sketch = contextSketch(C, 1); /* create just to be sure */ sk_cancelStroke(sketch); MEM_freeN(op->customdata); - return OPERATOR_CANCELLED; } static int sketch_draw_gesture(bContext *C, wmOperator *op, const wmEvent *event) @@ -2622,7 +2620,7 @@ void SKETCH_OT_cancel_stroke(wmOperatorType *ot) ot->description = "Cancel the current sketch stroke"; /* api callbacks */ - ot->invoke = sketch_cancel; + ot->invoke = sketch_cancel_invoke; ot->poll = ED_operator_sketch_mode_active_stroke; diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 182f94b3693..4a40eff204a 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -1532,10 +1532,9 @@ static int poselib_preview_exit(bContext *C, wmOperator *op) } /* Cancel previewing operation (called when exiting Blender) */ -static int poselib_preview_cancel(bContext *C, wmOperator *op) +static void poselib_preview_cancel(bContext *C, wmOperator *op) { poselib_preview_exit(C, op); - return OPERATOR_CANCELLED; } /* main modal status check */ diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index d0e1b15064a..82652702fe7 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -682,11 +682,10 @@ static int pose_slide_modal(bContext *C, wmOperator *op, const wmEvent *event) } /* common code for cancel() */ -static int pose_slide_cancel(bContext *UNUSED(C), wmOperator *op) +static void pose_slide_cancel(bContext *UNUSED(C), wmOperator *op) { /* cleanup and done */ pose_slide_exit(op); - return OPERATOR_CANCELLED; } /* common code for exec() methods */ |