diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 11:56:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 11:58:20 +0300 |
| commit | 358e1181b5afdd818bdb27d7e1a716079ad4aac2 (patch) | |
| tree | 418c492c4d5db6c65661f317804588ee4a41155e /source/blender/editors/space_view3d | |
| parent | 04570e91202cf0b9af4322adf4d5389b862b593d (diff) | |
Keymap: remove Shift-B in camera view
We already have Ctrl-B for setting the border,
no need for two keys to do the same thing.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 13 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 3 |
2 files changed, 1 insertions, 15 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 95040e04d20..743dae6964f 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3223,7 +3223,6 @@ void VIEW3D_OT_view_center_lock(wmOperatorType *ot) static int render_border_exec(bContext *C, wmOperator *op) { - Depsgraph *depsgraph = CTX_data_depsgraph(C); View3D *v3d = CTX_wm_view3d(C); ARegion *ar = CTX_wm_region(C); RegionView3D *rv3d = ED_view3d_context_rv3d(C); @@ -3233,17 +3232,13 @@ static int render_border_exec(bContext *C, wmOperator *op) rcti rect; rctf vb, border; - const bool camera_only = RNA_boolean_get(op->ptr, "camera_only"); - - if (camera_only && rv3d->persp != RV3D_CAMOB) - return OPERATOR_PASS_THROUGH; - /* get border select values using rna */ WM_operator_properties_border_to_rcti(op, &rect); /* calculate range */ if (rv3d->persp == RV3D_CAMOB) { + Depsgraph *depsgraph = CTX_data_depsgraph(C); ED_view3d_calc_camera_border(scene, depsgraph, ar, v3d, rv3d, &vb, false); } else { @@ -3297,8 +3292,6 @@ static int render_border_exec(bContext *C, wmOperator *op) void VIEW3D_OT_render_border(wmOperatorType *ot) { - PropertyRNA *prop; - /* identifiers */ ot->name = "Set Render Border"; ot->description = "Set the boundaries of the border render and enable border render"; @@ -3317,10 +3310,6 @@ void VIEW3D_OT_render_border(wmOperatorType *ot) /* properties */ WM_operator_properties_border(ot); - - prop = RNA_def_boolean(ot->srna, "camera_only", false, "Camera Only", - "Set render border for camera view and final render only"); - RNA_def_property_flag(prop, PROP_HIDDEN); } /** \} */ diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 0fd109f858d..18b63151c8e 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -495,10 +495,7 @@ void view3d_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "VIEW3D_OT_clip_border", BKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "VIEW3D_OT_zoom_border", BKEY, KM_PRESS, KM_SHIFT, 0); - kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_render_border", BKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "camera_only", true); kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_render_border", BKEY, KM_PRESS, KM_CTRL, 0); - RNA_boolean_set(kmi->ptr, "camera_only", false); WM_keymap_add_item(keymap, "VIEW3D_OT_clear_render_border", BKEY, KM_PRESS, KM_CTRL | KM_ALT, 0); |