[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61016] trunk/blender: remove return argument from wmOperatorType->cancel, was only ever returning OPERATOR_CANCELLED.
Campbell Barton
ideasman42 at gmail.com
Thu Oct 31 00:08:54 CET 2013
Revision: 61016
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61016
Author: campbellbarton
Date: 2013-10-30 23:08:53 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
remove return argument from wmOperatorType->cancel, was only ever returning OPERATOR_CANCELLED.
Modified Paths:
--------------
trunk/blender/release/scripts/templates_py/operator_modal_timer.py
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/pose_lib.c
trunk/blender/source/blender/editors/armature/pose_slide.c
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/interface/interface_eyedropper.c
trunk/blender/source/blender/editors/interface/view2d_ops.c
trunk/blender/source/blender/editors/mesh/editmesh_bevel.c
trunk/blender/source/blender/editors/mesh/editmesh_inset.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/sound/sound_ops.c
trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_console/console_ops.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_relationships.c
trunk/blender/source/blender/editors/space_node/node_view.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_view.c
trunk/blender/source/blender/editors/space_text/text_autocomplete.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/WM_types.h
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/release/scripts/templates_py/operator_modal_timer.py
===================================================================
--- trunk/blender/release/scripts/templates_py/operator_modal_timer.py 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/release/scripts/templates_py/operator_modal_timer.py 2013-10-30 23:08:53 UTC (rev 61016)
@@ -29,7 +29,6 @@
def cancel(self, context):
wm = context.window_manager
wm.event_timer_remove(self._timer)
- return {'CANCELLED'}
def register():
Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -711,13 +711,11 @@
}
/* only for modal */
-static int ed_marker_move_cancel(bContext *C, wmOperator *op)
+static void ed_marker_move_cancel(bContext *C, wmOperator *op)
{
RNA_int_set(op->ptr, "frames", 0);
ed_marker_move_apply(C, op);
ed_marker_move_exit(C, op);
-
- return OPERATOR_CANCELLED;
}
Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -2339,7 +2339,7 @@
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 @@
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 @@
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 @@
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;
Modified: trunk/blender/source/blender/editors/armature/pose_lib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/pose_lib.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/armature/pose_lib.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -1532,10 +1532,9 @@
}
/* 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 */
Modified: trunk/blender/source/blender/editors/armature/pose_slide.c
===================================================================
--- trunk/blender/source/blender/editors/armature/pose_slide.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/armature/pose_slide.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -682,11 +682,10 @@
}
/* 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 */
Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/curve/editfont.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -1613,11 +1613,10 @@
uiIDContextProperty(C, &pprop->ptr, &pprop->prop);
}
-static int font_open_cancel(bContext *UNUSED(C), wmOperator *op)
+static void font_open_cancel(bContext *UNUSED(C), wmOperator *op)
{
MEM_freeN(op->customdata);
op->customdata = NULL;
- return OPERATOR_CANCELLED;
}
static int font_open_exec(bContext *C, wmOperator *op)
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -1456,11 +1456,10 @@
op->customdata = NULL;
}
-static int gpencil_draw_cancel(bContext *C, wmOperator *op)
+static void gpencil_draw_cancel(bContext *C, wmOperator *op)
{
/* this is just a wrapper around exit() */
gpencil_draw_exit(C, op);
- return OPERATOR_CANCELLED;
}
/* ------------------------------- */
Modified: trunk/blender/source/blender/editors/interface/interface_eyedropper.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_eyedropper.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/interface/interface_eyedropper.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -122,10 +122,9 @@
}
}
-static int eyedropper_cancel(bContext *C, wmOperator *op)
+static void eyedropper_cancel(bContext *C, wmOperator *op)
{
eyedropper_exit(C, op);
- return OPERATOR_CANCELLED;
}
/* *** eyedropper_color_ helper functions *** */
@@ -243,7 +242,8 @@
switch (event->type) {
case ESCKEY:
case RIGHTMOUSE:
- return eyedropper_cancel(C, op);
+ eyedropper_cancel(C, op);
+ return OPERATOR_CANCELLED;
case LEFTMOUSE:
if (event->val == KM_RELEASE) {
if (eye->accum_tot == 0) {
@@ -447,10 +447,9 @@
}
}
-static int datadropper_cancel(bContext *C, wmOperator *op)
+static void datadropper_cancel(bContext *C, wmOperator *op)
{
datadropper_exit(C, op);
- return OPERATOR_CANCELLED;
}
/* *** datadropper id helper functions *** */
@@ -552,7 +551,8 @@
switch (event->type) {
case ESCKEY:
case RIGHTMOUSE:
- return datadropper_cancel(C, op);
+ datadropper_cancel(C, op);
+ return OPERATOR_CANCELLED;
case LEFTMOUSE:
if (event->val == KM_RELEASE) {
bool success;
Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -284,10 +284,9 @@
return OPERATOR_RUNNING_MODAL;
}
-static int view_pan_cancel(bContext *UNUSED(C), wmOperator *op)
+static void view_pan_cancel(bContext *UNUSED(C), wmOperator *op)
{
view_pan_exit(op);
- return OPERATOR_CANCELLED;
}
static void VIEW2D_OT_pan(wmOperatorType *ot)
@@ -906,11 +905,9 @@
}
}
-static int view_zoomdrag_cancel(bContext *C, wmOperator *op)
+static void view_zoomdrag_cancel(bContext *C, wmOperator *op)
{
view_zoomdrag_exit(C, op);
-
- return OPERATOR_CANCELLED;
}
/* for 'redo' only, with no user input */
@@ -1579,11 +1576,9 @@
}
}
-static int scroller_activate_cancel(bContext *C, wmOperator *op)
+static void scroller_activate_cancel(bContext *C, wmOperator *op)
{
scroller_activate_exit(C, op);
-
- return OPERATOR_CANCELLED;
}
/* apply transform to view (i.e. adjust 'cur' rect) */
Modified: trunk/blender/source/blender/editors/mesh/editmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_bevel.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/mesh/editmesh_bevel.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -185,7 +185,7 @@
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 @@
/* 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!!*/
Modified: trunk/blender/source/blender/editors/mesh/editmesh_inset.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_inset.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/mesh/editmesh_inset.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -166,7 +166,7 @@
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 @@
/* 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)
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-10-30 22:13:28 UTC (rev 61015)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-10-30 23:08:53 UTC (rev 61016)
@@ -3195,11 +3195,10 @@
}
}
-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)
Modified: trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list