diff options
Diffstat (limited to 'source/blender/editors/space_view3d')
5 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 732ee302ac5..e710d7b2d2a 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3230,7 +3230,7 @@ static int render_border_exec(bContext *C, wmOperator *op) rcti rect; rctf vb, border; - /* get border select values using rna */ + /* get box select values using rna */ WM_operator_properties_border_to_rcti(op, &rect); /* calculate range */ @@ -3296,10 +3296,10 @@ void VIEW3D_OT_render_border(wmOperatorType *ot) ot->idname = "VIEW3D_OT_render_border"; /* api callbacks */ - ot->invoke = WM_gesture_border_invoke; + ot->invoke = WM_gesture_box_invoke; ot->exec = render_border_exec; - ot->modal = WM_gesture_border_modal; - ot->cancel = WM_gesture_border_cancel; + ot->modal = WM_gesture_box_modal; + ot->cancel = WM_gesture_box_cancel; ot->poll = ED_operator_view3d_active; @@ -3392,7 +3392,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op) /* note; otherwise opengl won't work */ view3d_operator_needs_opengl(C); - /* get border select values using rna */ + /* get box select values using rna */ WM_operator_properties_border_to_rcti(op, &rect); /* check if zooming in/out view */ @@ -3514,10 +3514,10 @@ void VIEW3D_OT_zoom_border(wmOperatorType *ot) ot->idname = "VIEW3D_OT_zoom_border"; /* api callbacks */ - ot->invoke = WM_gesture_border_invoke; + ot->invoke = WM_gesture_box_invoke; ot->exec = view3d_zoom_border_exec; - ot->modal = WM_gesture_border_modal; - ot->cancel = WM_gesture_border_cancel; + ot->modal = WM_gesture_box_modal; + ot->cancel = WM_gesture_box_cancel; ot->poll = ED_operator_region_view3d_active; @@ -3525,7 +3525,7 @@ void VIEW3D_OT_zoom_border(wmOperatorType *ot) ot->flag = 0; /* properties */ - WM_operator_properties_gesture_border_zoom(ot); + WM_operator_properties_gesture_box_zoom(ot); } /** \} */ @@ -4588,7 +4588,7 @@ static int view3d_clipping_invoke(bContext *C, wmOperator *op, const wmEvent *ev return OPERATOR_FINISHED; } else { - return WM_gesture_border_invoke(C, op, event); + return WM_gesture_box_invoke(C, op, event); } } @@ -4603,8 +4603,8 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot) /* api callbacks */ ot->invoke = view3d_clipping_invoke; ot->exec = view3d_clipping_exec; - ot->modal = WM_gesture_border_modal; - ot->cancel = WM_gesture_border_cancel; + ot->modal = WM_gesture_box_modal; + ot->cancel = WM_gesture_box_cancel; ot->poll = ED_operator_region_view3d_active; diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index b8edbfe9b65..99132820b20 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -166,7 +166,7 @@ float view3d_depth_near(struct ViewDepths *d); /* view3d_select.c */ void VIEW3D_OT_select(struct wmOperatorType *ot); void VIEW3D_OT_select_circle(struct wmOperatorType *ot); -void VIEW3D_OT_select_border(struct wmOperatorType *ot); +void VIEW3D_OT_select_box(struct wmOperatorType *ot); void VIEW3D_OT_select_lasso(struct wmOperatorType *ot); void VIEW3D_OT_select_menu(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 6635b02a6c7..9ed59759e4d 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -191,7 +191,7 @@ void view3d_operatortypes(void) WM_operatortype_append(VIEW3D_OT_view_center_camera); WM_operatortype_append(VIEW3D_OT_view_center_lock); WM_operatortype_append(VIEW3D_OT_select); - WM_operatortype_append(VIEW3D_OT_select_border); + WM_operatortype_append(VIEW3D_OT_select_box); WM_operatortype_append(VIEW3D_OT_clip_border); WM_operatortype_append(VIEW3D_OT_select_circle); WM_operatortype_append(VIEW3D_OT_smoothview); @@ -484,7 +484,7 @@ void view3d_keymap(wmKeyConfig *keyconf) RNA_boolean_set(kmi->ptr, "object", false); RNA_boolean_set(kmi->ptr, "enumerate", true); - WM_keymap_add_item(keymap, "VIEW3D_OT_select_border", BKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_select_box", BKEY, KM_PRESS, 0, 0); kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL, 0); RNA_enum_set(kmi->ptr, "mode", SEL_OP_ADD); kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_SHIFT | KM_CTRL, 0); diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index a3bd31423e8..26a9a8f24c1 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -311,7 +311,7 @@ static bool view3d_selectable_data(bContext *C) } -/* helper also for borderselect */ +/* helper also for box_select */ static bool edge_fully_inside_rect(const rctf *rect, const float v1[2], const float v2[2]) { return BLI_rctf_isect_pt_v(rect, v1) && BLI_rctf_isect_pt_v(rect, v2); @@ -448,7 +448,7 @@ static void do_lasso_select_objects( /** - * Use for lasso & border select. + * Use for lasso & box select. */ static Base **do_pose_tag_select_op_prepare(ViewContext *vc, uint *r_bases_len) { @@ -2472,7 +2472,7 @@ static int do_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, const eS return hits > 0 ? OPERATOR_FINISHED : OPERATOR_CANCELLED; } -static int view3d_borderselect_exec(bContext *C, wmOperator *op) +static int view3d_box_select_exec(bContext *C, wmOperator *op) { ViewContext vc; rcti rect; @@ -2530,7 +2530,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op) } break; default: - assert(!"border select on incorrect object type"); + assert(!"box select on incorrect object type"); break; } } @@ -2548,7 +2548,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op) ret |= do_paintvert_box_select(&vc, &rect, sel_op); } else if (vc.obact && vc.obact->mode & OB_MODE_PARTICLE_EDIT) { - ret |= PE_border_select(C, &rect, sel_op); + ret |= PE_box_select(C, &rect, sel_op); } else if (vc.obact && vc.obact->mode & OB_MODE_POSE) { ret |= do_pose_box_select(C, &vc, &rect, sel_op); @@ -2571,26 +2571,26 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op) /* *****************Selection Operators******************* */ -/* ****** Border Select ****** */ -void VIEW3D_OT_select_border(wmOperatorType *ot) +/* ****** Box Select ****** */ +void VIEW3D_OT_select_box(wmOperatorType *ot) { /* identifiers */ - ot->name = "Border Select"; - ot->description = "Select items using border selection"; - ot->idname = "VIEW3D_OT_select_border"; + ot->name = "Box Select"; + ot->description = "Select items using box selection"; + ot->idname = "VIEW3D_OT_select_box"; /* api callbacks */ - ot->invoke = WM_gesture_border_invoke; - ot->exec = view3d_borderselect_exec; - ot->modal = WM_gesture_border_modal; + ot->invoke = WM_gesture_box_invoke; + ot->exec = view3d_box_select_exec; + ot->modal = WM_gesture_box_modal; ot->poll = view3d_selectable_data; - ot->cancel = WM_gesture_border_cancel; + ot->cancel = WM_gesture_box_cancel; /* flags */ ot->flag = OPTYPE_UNDO; /* rna */ - WM_operator_properties_gesture_border(ot); + WM_operator_properties_gesture_box(ot); WM_operator_properties_select_operation(ot); } diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 67cbc1e99b9..33a3cd8e151 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -930,7 +930,7 @@ int view3d_opengl_select( char gpu_select_mode; - /* case not a border select */ + /* case not a box select */ if (input->xmin == input->xmax) { /* seems to be default value for bones only now */ BLI_rcti_init_pt_radius(&rect, (const int[2]){input->xmin, input->ymin}, 12); |