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 /source/blender | |
| 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.
Diffstat (limited to 'source/blender')
4 files changed, 6 insertions, 3 deletions
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 */ |