archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

3D View: add back clipping border operator

Browse Source
This commit is contained in:
Campbell Barton
2019-01-21 11:05:15 +11:00
parent 7467049055
commit c53ebfa9e9
6 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@@ -1035,7 +1035,7 @@ def km_view3d(params):
{"properties": [("mode", 'SUB')]}),
("view3d.select_circle", {"type": 'C', "value": 'PRESS'}, None),
# Borders.
# ("view3d.clip_border", {"type": 'B', "value": 'PRESS', "alt": True}, None),
("view3d.clip_border", {"type": 'B', "value": 'PRESS', "alt": True}, None),
("view3d.zoom_border", {"type": 'B', "value": 'PRESS', "shift": True}, None),
("view3d.render_border", {"type": 'B', "value": 'PRESS', "ctrl": True}, None),
("view3d.clear_render_border", {"type": 'B', "value": 'PRESS', "ctrl": True, "alt": True}, None),

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -784,7 +784,7 @@ class VIEW3D_MT_view_borders(Menu):
def draw(self, context):
layout = self.layout
# layout.operator("view3d.clip_border", text="Clipping Border...")
layout.operator("view3d.clip_border", text="Clipping Border...")
layout.operator("view3d.render_border", text="Render Border...")
layout.separator()

4
source/blender/editors/space_view3d/view3d_edit.c
View File

@@ -4565,9 +4565,6 @@ void ED_view3d_clipping_local(RegionView3D *rv3d, float mat[4][4])
calc_local_clipping(rv3d->clip_local, rv3d->clipbb, mat);
}
#if 0 /* TODO Missing from 2.8 drawing code.
* Find a solution to support clip border then uncomment it. */
static int view3d_clipping_exec(bContext *C, wmOperator *op)
{
ARegion *ar = CTX_wm_region(C);
@@ -4624,7 +4621,6 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot)
/* properties */
WM_operator_properties_border(ot);
}
#endif
/** \} */

2
source/blender/editors/space_view3d/view3d_intern.h
View File

@@ -97,7 +97,7 @@ void VIEW3D_OT_background_image_add(struct wmOperatorType *ot);
void VIEW3D_OT_background_image_remove(struct wmOperatorType *ot);
void VIEW3D_OT_view_orbit(struct wmOperatorType *ot);
void VIEW3D_OT_view_roll(struct wmOperatorType *ot);
// void VIEW3D_OT_clip_border(struct wmOperatorType *ot);
void VIEW3D_OT_clip_border(struct wmOperatorType *ot);
void VIEW3D_OT_cursor3d(struct wmOperatorType *ot);
void VIEW3D_OT_render_border(struct wmOperatorType *ot);
void VIEW3D_OT_clear_render_border(struct wmOperatorType *ot);

2
source/blender/editors/space_view3d/view3d_ops.c
View File

@@ -192,7 +192,7 @@ void view3d_operatortypes(void)
WM_operatortype_append(VIEW3D_OT_view_center_lock);
WM_operatortype_append(VIEW3D_OT_select);
WM_operatortype_append(VIEW3D_OT_select_box);
// WM_operatortype_append(VIEW3D_OT_clip_border);
WM_operatortype_append(VIEW3D_OT_clip_border);
WM_operatortype_append(VIEW3D_OT_select_circle);
WM_operatortype_append(VIEW3D_OT_smoothview);
WM_operatortype_append(VIEW3D_OT_render_border);

2
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -3310,7 +3310,7 @@ static void gesture_box_modal_keymap(wmKeyConfig *keyconf)
WM_modalkeymap_assign(keymap, "CLIP_OT_graph_select_box");
WM_modalkeymap_assign(keymap, "MASK_OT_select_box");
WM_modalkeymap_assign(keymap, "VIEW2D_OT_zoom_border");
// WM_modalkeymap_assign(keymap, "VIEW3D_OT_clip_border"); /* TODO */
WM_modalkeymap_assign(keymap, "VIEW3D_OT_clip_border");
WM_modalkeymap_assign(keymap, "VIEW3D_OT_render_border");
WM_modalkeymap_assign(keymap, "VIEW3D_OT_select_box");
WM_modalkeymap_assign(keymap, "VIEW3D_OT_zoom_border"); /* XXX TODO: zoom border should perhaps map rightmouse to zoom out instead of in+cancel */