diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-05 13:28:03 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-05 18:51:58 +0300 |
commit | 5bd57aaa052d9578d089a92338d6f0977b5d6c5c (patch) | |
tree | 8096acae927a2e65446b03b4cc2156821011c85c /source/blender/editors/space_view3d/view3d_header.c | |
parent | d8223468fe445797a300dd5cd97fe49f74ca6128 (diff) |
Viewport: tweak Z key shading toggle.
* Z now goes to solid mode when in lookdev or rendered mode.
* Alt-Z was broken after removal of texture mode, now toggles lookdev mode.
* Simplify code by turning it into a single operator.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_header.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index eeddacee808..a2dda8d6403 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -221,46 +221,10 @@ void VIEW3D_OT_layers(wmOperatorType *ot) RNA_def_boolean(ot->srna, "toggle", 1, "Toggle", "Toggle the layer"); } -/* -------------------------------------------------------------------- */ -/** \name Toggle Bone selection Overlay Operator - * \{ */ - -static int toggle_show_xray(bContext *C, wmOperator *UNUSED(op)) -{ - View3D *v3d = CTX_wm_view3d(C); - v3d->shading.flag ^= V3D_SHADING_XRAY; - ED_view3d_shade_update(CTX_data_main(C), v3d, CTX_wm_area(C)); - WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d); - return OPERATOR_FINISHED; -} - -static bool toggle_show_xray_poll(bContext *C) -{ - bool result = (ED_operator_view3d_active(C) && !ED_operator_posemode(C) && !ED_operator_editmesh(C)); - if (result) { - // Additional test for SOLID or TEXTURE mode - View3D *v3d = CTX_wm_view3d(C); - result = (v3d->drawtype & (OB_SOLID | OB_TEXTURE)) > 0; - } - return result; -} - -void VIEW3D_OT_toggle_xray_draw_option(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Toggle Show X-Ray"; - ot->description = "Toggle show X-Ray"; - ot->idname = "VIEW3D_OT_toggle_xray_draw_option"; - - /* api callbacks */ - ot->exec = toggle_show_xray; - ot->poll = toggle_show_xray_poll; -} - /** \} */ /* -------------------------------------------------------------------- */ -/** \name Toggle Bone selection Overlay Operator +/** \name Toggle Matcap Flip Operator * \{ */ static int toggle_matcap_flip(bContext *C, wmOperator *UNUSED(op)) @@ -281,7 +245,6 @@ void VIEW3D_OT_toggle_matcap_flip(wmOperatorType *ot) /* api callbacks */ ot->exec = toggle_matcap_flip; - // ot->poll = toggle_show_xray_poll; } /** \} */ |