diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-11-14 13:45:29 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-11-14 13:50:37 +0300 |
commit | 43ee433dceccf13868da683ec781b30f17185a2b (patch) | |
tree | 0ab37b47d1849ec333ee7f95e113dde3fb101552 | |
parent | c3d03b4434c8554bbfff6cdc549bb089dec1da28 (diff) |
UI: Comment out "Clip border" operator
Also Remove it from the UI as it has not been ported to 2.8 and it is a
delicate thing to do.
8 files changed, 10 insertions, 7 deletions
diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py index 3024a5638f2..206dc820f04 100644 --- a/release/scripts/presets/keyconfig/3dsmax.py +++ b/release/scripts/presets/keyconfig/3dsmax.py @@ -655,7 +655,7 @@ kmi.properties.deselect = False kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_A', 'ANY', shift=True, ctrl=True) kmi.properties.deselect = True kmi = km.keymap_items.new('view3d.select_circle', 'C', 'PRESS', alt=True) -kmi = km.keymap_items.new('view3d.clip_border', 'B', 'PRESS', alt=True) +# kmi = km.keymap_items.new('view3d.clip_border', 'B', 'PRESS', alt=True) kmi = km.keymap_items.new('view3d.zoom_border', 'B', 'PRESS', shift=True) kmi = km.keymap_items.new('view3d.render_border', 'B', 'PRESS', shift=True) kmi.properties.camera_only = True diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index e501f4e91ab..0320238a681 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -936,7 +936,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), diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py index 60e58d6324a..1ce2fb34ccf 100644 --- a/release/scripts/presets/keyconfig/maya.py +++ b/release/scripts/presets/keyconfig/maya.py @@ -1058,7 +1058,7 @@ kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_M', 'ANY', ctrl=True kmi.properties.deselect = True kmi = km.keymap_items.new('view3d.select_lasso', 'EVT_TWEAK_M', 'ANY', any=True) kmi = km.keymap_items.new('view3d.select_circle', 'Q', 'PRESS', shift=True) -kmi = km.keymap_items.new('view3d.clip_border', 'B', 'PRESS', alt=True) +# kmi = km.keymap_items.new('view3d.clip_border', 'B', 'PRESS', alt=True) kmi = km.keymap_items.new('view3d.zoom_border', 'B', 'PRESS', shift=True) kmi = km.keymap_items.new('wm.call_menu', 'S', 'PRESS', shift=True, ctrl=True) kmi.properties.name = 'VIEW3D_MT_snap' diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index ae360788a36..095f1e73eac 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -763,7 +763,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() diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 7f102189121..dea28b75745 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -4550,6 +4550,8 @@ 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); @@ -4606,6 +4608,7 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot) /* properties */ WM_operator_properties_border(ot); } +#endif /** \} */ diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index b3e77927024..8c21497dd53 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -98,7 +98,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); diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 6c56bd7e72b..0c916ebf2a3 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -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); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 56171167b99..1bb79755e46 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3288,7 +3288,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"); +// WM_modalkeymap_assign(keymap, "VIEW3D_OT_clip_border"); /* TODO */ 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 */ |