Cleanup: modal operator border callback names
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Oct 2017 06:01:28 +0000 (17:01 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Oct 2017 06:03:08 +0000 (17:03 +1100)
Use same convention as all others.
Remove 'select' since these are used for zoom as well.

27 files changed:
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/gpencil/gpencil_select.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/mask/mask_select.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_hide.c
source/blender/editors/space_action/action_select.c
source/blender/editors/space_clip/clip_graph_ops.c
source/blender/editors/space_clip/tracking_select.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_info/info_report.c
source/blender/editors/space_nla/nla_select.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_select.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_operator_props.c
source/blender/windowmanager/intern/wm_operators.c

index 117b8549712d922d88719af074150bd9608155d0..da7b6b085c06a1126e4b0621093180ddd59d8bf9 100644 (file)
@@ -2493,10 +2493,10 @@ static void ANIM_OT_channels_select_border(wmOperatorType *ot)
        ot->description = "Select all animation channels within the specified region";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = animchannels_borderselect_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = animedit_poll_channels_nla_tweakmode_off;
        
index efcc3e9477c9dac31bfb078aad0818798c98120b..926a41dd7ab4f2441501740b8bca761cbc43111f 100644 (file)
@@ -1265,7 +1265,7 @@ static int ed_marker_border_select_exec(bContext *C, wmOperator *op)
 
 static int ed_marker_select_border_invoke_wrapper(bContext *C, wmOperator *op, const wmEvent *event)
 {
-       return ed_markers_opwrap_invoke_custom(C, op, event, WM_border_select_invoke);
+       return ed_markers_opwrap_invoke_custom(C, op, event, WM_gesture_border_invoke);
 }
 
 static void MARKER_OT_select_border(wmOperatorType *ot)
@@ -1278,8 +1278,8 @@ static void MARKER_OT_select_border(wmOperatorType *ot)
        /* api callbacks */
        ot->exec = ed_marker_border_select_exec;
        ot->invoke = ed_marker_select_border_invoke_wrapper;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = ed_markers_poll_markers_exist;
        
index fcdd45d4ac3937845ca3bb21dd4e96410b8d836c..f22c8c5b4038b77158b58058daab5ed25c81584b 100644 (file)
@@ -318,10 +318,10 @@ static void ANIM_OT_previewrange_set(wmOperatorType *ot)
        ot->description = "Interactively define frame range used for playback";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = previewrange_define_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = ED_operator_animview_active;
        
index b552a1c99f8fe6c5abe0b30b240a786b65c8b7c0..bea78156900036ff239ad7b1b3b84e91710a654f 100644 (file)
@@ -933,10 +933,10 @@ void GPENCIL_OT_select_border(wmOperatorType *ot)
        ot->idname = "GPENCIL_OT_select_border";
        
        /* callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = gpencil_border_select_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = gpencil_select_poll;
        
index fa2c1f25cfcd55d704139615d0a526a9d0c32d84..ab8ec60696bc67bba593bcb06b983a7d6f23bb82 100644 (file)
@@ -1289,10 +1289,10 @@ static void VIEW2D_OT_zoom_border(wmOperatorType *ot)
        ot->idname = "VIEW2D_OT_zoom_border";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = view_borderzoom_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = view_zoom_poll;
        
index a7215a4b653098889ef39936cab38be411d171d7..543b005236a6f39f0db3bd812d033e74d33830d5 100644 (file)
@@ -471,9 +471,9 @@ void MASK_OT_select_border(wmOperatorType *ot)
        ot->idname = "MASK_OT_select_border";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = border_select_exec;
-       ot->modal = WM_border_select_modal;
+       ot->modal = WM_gesture_border_modal;
        ot->poll = ED_maskedit_mask_poll;
 
        /* flags */
index 27e19ca1fc330310837b6d6ab94d127d5a4f24ac..f23ea9058e52b047a2755c5e31b9c71790ec11be 100644 (file)
@@ -3836,9 +3836,9 @@ static void SCREEN_OT_border_select(wmOperatorType *ot)
        
        /* api callbacks */
        ot->exec = border_select_exec;
-       ot->invoke = WM_border_select_invoke;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->invoke = WM_gesture_border_invoke;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = ED_operator_areaactive;
        
index 5af6792f10f574f45fdf3d3e18132eb81c035337..899fb27077549beaab463ebe215098c35c4b6ec9 100644 (file)
@@ -435,7 +435,7 @@ static int hide_show_invoke(bContext *C, wmOperator *op, const wmEvent *event)
        PartialVisArea area = RNA_enum_get(op->ptr, "area");
 
        if (!ELEM(area, PARTIALVIS_ALL, PARTIALVIS_MASKED))
-               return WM_border_select_invoke(C, op, event);
+               return WM_gesture_border_invoke(C, op, event);
        else
                return op->type->exec(C, op);
 }
@@ -463,7 +463,7 @@ void PAINT_OT_hide_show(struct wmOperatorType *ot)
 
        /* api callbacks */
        ot->invoke = hide_show_invoke;
-       ot->modal = WM_border_select_modal;
+       ot->modal = WM_gesture_border_modal;
        ot->exec = hide_show_exec;
        /* sculpt-only for now */
        ot->poll = sculpt_mode_poll_view3d;
index 22b7b1da77f71ae894eebcffd61ccb2b9f54d3d5..44b272af189492ef160e3c3eb66d6dc376d4b189 100644 (file)
@@ -362,10 +362,10 @@ void ACTION_OT_select_border(wmOperatorType *ot)
        ot->description = "Select all keyframes within the specified region";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = actkeys_borderselect_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = ED_operator_action_active;
        
index e781d199d354c901d9f3e25903d76c6d265a5b11..9c832ba052a0455ad6d6515be43e69e5eb1548c3 100644 (file)
@@ -402,9 +402,9 @@ void CLIP_OT_graph_select_border(wmOperatorType *ot)
        ot->idname = "CLIP_OT_graph_select_border";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = border_select_graph_exec;
-       ot->modal = WM_border_select_modal;
+       ot->modal = WM_gesture_border_modal;
        ot->poll = clip_graph_knots_poll;
 
        /* flags */
index 6077379d4200fd793bcdd57b68f92fbe10b2ed5e..c5947852c6db97da13bbdc7e97679faa8385e833 100644 (file)
@@ -520,9 +520,9 @@ void CLIP_OT_select_border(wmOperatorType *ot)
        ot->idname = "CLIP_OT_select_border";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = border_select_exec;
-       ot->modal = WM_border_select_modal;
+       ot->modal = WM_gesture_border_modal;
        ot->poll = ED_space_clip_tracking_poll;
 
        /* flags */
index 22c1214d92852c4759830109cc33b96297ebad83..20509a7157560932430c31604e99df5378094178 100644 (file)
@@ -370,7 +370,7 @@ static int file_border_select_modal(bContext *C, wmOperator *op, const wmEvent *
 
        int result;
 
-       result = WM_border_select_modal(C, op, event);
+       result = WM_gesture_border_modal(C, op, event);
 
        if (result == OPERATOR_RUNNING_MODAL) {
                WM_operator_properties_border_to_rcti(op, &rect);
@@ -452,11 +452,11 @@ void FILE_OT_select_border(wmOperatorType *ot)
        ot->idname = "FILE_OT_select_border";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = file_border_select_exec;
        ot->modal = file_border_select_modal;
        ot->poll = ED_operator_file_active;
-       ot->cancel = WM_border_select_cancel;
+       ot->cancel = WM_gesture_border_cancel;
 
        /* properties */
        WM_operator_properties_gesture_border(ot, 1);
index 2d60946a20046e043591d2097ef1420cdb07ae92..9ff5d7f3e7faa04af97c5cae5e9927cfcd3f8588 100644 (file)
@@ -391,10 +391,10 @@ void GRAPH_OT_select_border(wmOperatorType *ot)
        ot->description = "Select all keyframes within the specified region";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = graphkeys_borderselect_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = graphop_visible_keyframes_poll;
        
index 02e246d86303ed3dfe32b001adbe9d320314eb18..bedac0b878d6a153c54c4712f4d4f9f89c26a422 100644 (file)
@@ -1038,10 +1038,10 @@ void IMAGE_OT_view_zoom_border(wmOperatorType *ot)
        ot->idname = "IMAGE_OT_view_zoom_border";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = image_view_zoom_border_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
 
        ot->poll = space_image_main_region_poll;
 
@@ -3688,10 +3688,10 @@ void IMAGE_OT_render_border(wmOperatorType *ot)
        ot->idname = "IMAGE_OT_render_border";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = render_border_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        ot->poll = image_cycle_render_slot_poll;
 
        /* flags */
index 0cc01646e82e86e16e60de9de2fad3fe631d6ef6..8c7b7b5014e290e4835736252d107775954a9070 100644 (file)
@@ -298,10 +298,10 @@ void INFO_OT_select_border(wmOperatorType *ot)
        ot->idname = "INFO_OT_select_border";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = borderselect_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
 
        ot->poll = ED_operator_info_active;
 
index 8261397c940985526ec387662018841c152bcaab..6dde81162cf4c2f288de65e560bcf672019c98b9 100644 (file)
@@ -329,10 +329,10 @@ void NLA_OT_select_border(wmOperatorType *ot)
        ot->description = "Use box selection to grab NLA-Strips";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = nlaedit_borderselect_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = nlaop_poll_tweakmode_off;
        
index e91fd1ee575e1168b2892f1a6f049cfced03b14d..9ed7e08dc62cca23e5e64b99194c2667de8c3981 100644 (file)
@@ -2563,10 +2563,10 @@ void NODE_OT_viewer_border(wmOperatorType *ot)
        ot->idname = "NODE_OT_viewer_border";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = viewer_border_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        ot->poll = composite_node_active;
 
        /* flags */
index 98ba46fc87a591d351277292aed82624e6a6123c..8a0c8e0ac95a47621ea8c4e18ffce8546f86abe7 100644 (file)
@@ -571,7 +571,7 @@ static int node_border_select_invoke(bContext *C, wmOperator *op, const wmEvent
                        return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
        }
        
-       return WM_border_select_invoke(C, op, event);
+       return WM_gesture_border_invoke(C, op, event);
 }
 
 void NODE_OT_select_border(wmOperatorType *ot)
@@ -584,8 +584,8 @@ void NODE_OT_select_border(wmOperatorType *ot)
        /* api callbacks */
        ot->invoke = node_border_select_invoke;
        ot->exec = node_borderselect_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = ED_operator_node_active;
        
index 18cc2a015e6005b12f98dfa6bee01f7f1b19e1e8..4ed524a4fff1cc74ec569e849908e0cd008cb675 100644 (file)
@@ -1119,10 +1119,10 @@ void OUTLINER_OT_select_border(wmOperatorType *ot)
        ot->description = "Use box selection to select tree elements";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = outliner_border_select_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
 
        ot->poll = ED_operator_outliner_active;
 
index 196527dcc60c056d1dd45d81ce32a1a5b97d742a..2a77b85c1828fa8045897f47afcb50cfdbe533f6 100644 (file)
@@ -3421,11 +3421,11 @@ void SEQUENCER_OT_view_ghost_border(wmOperatorType *ot)
        ot->description = "Set the boundaries of the border used for offset-view";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = view_ghost_border_exec;
-       ot->modal = WM_border_select_modal;
+       ot->modal = WM_gesture_border_modal;
        ot->poll = sequencer_view_preview_poll;
-       ot->cancel = WM_border_select_cancel;
+       ot->cancel = WM_gesture_border_cancel;
 
        /* flags */
        ot->flag = 0;
index d88ed36e392cbd1977d6d965f524ecc866d7458c..ddd68a4c3d9d044eabc9327513d5a8bc2c6320fe 100644 (file)
@@ -927,10 +927,10 @@ void SEQUENCER_OT_select_border(wmOperatorType *ot)
        ot->description = "Select strips using border selection";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = sequencer_borderselect_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
        
        ot->poll = ED_operator_sequencer_active;
        
index 97fcca1196278a8fb20df3870772f283e7be3003..b6619f355f028c315665192d28bfbcfad3f94e07 100644 (file)
@@ -3507,10 +3507,10 @@ void VIEW3D_OT_render_border(wmOperatorType *ot)
        ot->idname = "VIEW3D_OT_render_border";
 
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = render_border_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
 
        ot->poll = ED_operator_view3d_active;
 
@@ -3728,7 +3728,7 @@ static int view3d_zoom_border_invoke(bContext *C, wmOperator *op, const wmEvent
 
        /* if in camera view do not exec the operator so we do not conflict with set render border*/
        if ((rv3d->persp != RV3D_CAMOB) || ED_view3d_camera_lock_check(v3d, rv3d))
-               return WM_border_select_invoke(C, op, event);
+               return WM_gesture_border_invoke(C, op, event);
        else
                return OPERATOR_PASS_THROUGH;
 }
@@ -3743,8 +3743,8 @@ void VIEW3D_OT_zoom_border(wmOperatorType *ot)
        /* api callbacks */
        ot->invoke = view3d_zoom_border_invoke;
        ot->exec = view3d_zoom_border_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
 
        ot->poll = ED_operator_region_view3d_active;
 
@@ -4672,7 +4672,7 @@ static int view3d_clipping_invoke(bContext *C, wmOperator *op, const wmEvent *ev
                return OPERATOR_FINISHED;
        }
        else {
-               return WM_border_select_invoke(C, op, event);
+               return WM_gesture_border_invoke(C, op, event);
        }
 }
 
@@ -4688,8 +4688,8 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot)
        /* api callbacks */
        ot->invoke = view3d_clipping_invoke;
        ot->exec = view3d_clipping_exec;
-       ot->modal = WM_border_select_modal;
-       ot->cancel = WM_border_select_cancel;
+       ot->modal = WM_gesture_border_modal;
+       ot->cancel = WM_gesture_border_cancel;
 
        ot->poll = ED_operator_region_view3d_active;
 
index 5945c7497da0361d03ea6dd33cb687ff073217b0..51af4c2dd5fffb464a4966fb2586393b387a7a15 100644 (file)
@@ -2214,11 +2214,11 @@ void VIEW3D_OT_select_border(wmOperatorType *ot)
        ot->idname = "VIEW3D_OT_select_border";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = view3d_borderselect_exec;
-       ot->modal = WM_border_select_modal;
+       ot->modal = WM_gesture_border_modal;
        ot->poll = view3d_selectable_data;
-       ot->cancel = WM_border_select_cancel;
+       ot->cancel = WM_gesture_border_cancel;
        
        /* flags */
        ot->flag = OPTYPE_UNDO;
index 6056b3acdc3c59cb657231b1ed40be8d72ac1be9..faaf9ba23b28c9262890b60c951d19c1d25e5a47 100644 (file)
@@ -2956,11 +2956,11 @@ static void UV_OT_select_border(wmOperatorType *ot)
        ot->idname = "UV_OT_select_border";
        
        /* api callbacks */
-       ot->invoke = WM_border_select_invoke;
+       ot->invoke = WM_gesture_border_invoke;
        ot->exec = uv_border_select_exec;
-       ot->modal = WM_border_select_modal;
+       ot->modal = WM_gesture_border_modal;
        ot->poll = ED_operator_uvedit_space_image; /* requires space image */;
-       ot->cancel = WM_border_select_cancel;
+       ot->cancel = WM_gesture_border_cancel;
        
        /* flags */
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
index 40722736d5811489800466e619d8ca0441f08142..aa52e7d224851d62084770028a0a870cd724815d 100644 (file)
@@ -374,9 +374,9 @@ void                WM_menutype_freelink(struct MenuType *mt);
 void                WM_menutype_free(void);
 
                        /* default operator callbacks for border/circle/lasso */
-int                    WM_border_select_invoke (struct bContext *C, struct wmOperator *op, const struct wmEvent *event);
-int                    WM_border_select_modal  (struct bContext *C, struct wmOperator *op, const struct wmEvent *event);
-void           WM_border_select_cancel(struct bContext *C, struct wmOperator *op);
+int                    WM_gesture_border_invoke        (struct bContext *C, struct wmOperator *op, const struct wmEvent *event);
+int                    WM_gesture_border_modal (struct bContext *C, struct wmOperator *op, const struct wmEvent *event);
+void           WM_gesture_border_cancel(struct bContext *C, struct wmOperator *op);
 int                    WM_gesture_circle_invoke(struct bContext *C, struct wmOperator *op, const struct wmEvent *event);
 int                    WM_gesture_circle_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event);
 void           WM_gesture_circle_cancel(struct bContext *C, struct wmOperator *op);
index 569cd43a52446bec34683e68ffb934b4b6d1cb51..b8b527981756202207ba167e0b4e6e9ca62c1723 100644 (file)
@@ -225,7 +225,7 @@ void WM_operator_properties_border_to_rctf(struct wmOperator *op, rctf *rect)
 }
 
 /**
- * Use with #WM_border_select_invoke
+ * Use with #WM_gesture_border_invoke
  */
 void WM_operator_properties_gesture_border(wmOperatorType *ot, bool extend)
 {
index 307c8b24c1ed1a0bb556d0f0cce79469d58cccf3..42f1325709574cbe8384354cf3fab300c8abfe45 100644 (file)
@@ -2312,7 +2312,7 @@ static void wm_gesture_end(bContext *C, wmOperator *op)
        }
 }
 
-int WM_border_select_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+int WM_gesture_border_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
        if (ISTWEAK(event->type))
                op->customdata = WM_gesture_new(C, event, WM_GESTURE_RECT);
@@ -2327,7 +2327,7 @@ int WM_border_select_invoke(bContext *C, wmOperator *op, const wmEvent *event)
        return OPERATOR_RUNNING_MODAL;
 }
 
-int WM_border_select_modal(bContext *C, wmOperator *op, const wmEvent *event)
+int WM_gesture_border_modal(bContext *C, wmOperator *op, const wmEvent *event)
 {
        wmGesture *gesture = op->customdata;
        rcti *rect = gesture->customdata;
@@ -2386,7 +2386,7 @@ int WM_border_select_modal(bContext *C, wmOperator *op, const wmEvent *event)
        return OPERATOR_RUNNING_MODAL;
 }
 
-void WM_border_select_cancel(bContext *C, wmOperator *op)
+void WM_gesture_border_cancel(bContext *C, wmOperator *op)
 {
        wm_gesture_end(C, op);
 }