From 110abebe1d4a4fe4667b42ad47adcf33bfcafad0 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 1 Aug 2018 17:28:30 +0200 Subject: Fix missing poll function for flip_matcap operator (see T56183). --- source/blender/editors/space_view3d/view3d_header.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/editors/space_view3d/view3d_header.c') diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index c9277235d50..da449fac183 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -245,6 +245,7 @@ void VIEW3D_OT_toggle_matcap_flip(wmOperatorType *ot) /* api callbacks */ ot->exec = toggle_matcap_flip; + ot->poll = ED_operator_view3d_active; } /** \} */ -- cgit v1.2.3 From e8e812fb1d2014ac62b9224ce74532c7f8d740d9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 8 Aug 2018 15:33:11 +1000 Subject: UI: only show vertex select w/ weight paint mode Was being used for vertex paint where it's not supported. --- source/blender/editors/space_view3d/view3d_header.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d/view3d_header.c') diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index da449fac183..83cabd2a60e 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -321,7 +321,9 @@ static void uiTemplatePaintModeSelection(uiLayout *layout, struct bContext *C) else { uiLayout *row = uiLayoutRow(layout, true); uiItemR(row, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); - uiItemR(row, &meshptr, "use_paint_mask_vertex", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + if (ob->mode & OB_MODE_WEIGHT_PAINT) { + uiItemR(row, &meshptr, "use_paint_mask_vertex", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + } } } } -- cgit v1.2.3