From 2050baa139006760fc43ea94cbfb1290698575f5 Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Thu, 12 Mar 2020 20:29:04 +0100 Subject: GPencil: Move Vertex Paint mode to topbar It's more easy to find in the topbar --- .../scripts/startup/bl_ui/properties_grease_pencil_common.py | 4 ---- release/scripts/startup/bl_ui/properties_paint_common.py | 10 +++++++++- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index fced848641e..7c79349a245 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -692,10 +692,6 @@ class GreasePencilVertexcolorPanel: row = layout.row(align=True) row.prop(gp_settings, "vertex_color_factor", slider=True, text="Mix Factor") - if tool == 'TINT' or is_vertex is True: - row = layout.row(align=True) - row.prop(gp_settings, "vertex_mode", text="Mode") - class GPENCIL_UL_layer(UIList): def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index): diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index b50791050c4..34afcc09407 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -1065,13 +1065,16 @@ def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False) row = layout.row(align=True) row.prop(gp_settings, "fill_simplify_level", text="Simplify") - else: # brush.gpencil_tool == 'DRAW': + else: # brush.gpencil_tool == 'DRAW/TINT': row = layout.row(align=True) row.prop(brush, "size", text="Radius") row.prop(gp_settings, "use_pressure", text="", icon='STYLUS_PRESSURE') row = layout.row(align=True) row.prop(gp_settings, "pen_strength", slider=True) row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE') + if brush.gpencil_tool == 'TINT': + row = layout.row(align=True) + row.prop(gp_settings, "vertex_mode", text="Mode") # FIXME: tools must use their own UI drawing! if tool.idname in { @@ -1159,6 +1162,11 @@ def brush_basic_gpencil_vertex_settings(layout, _context, brush, *, compact=Fals row.prop(gp_settings, "pen_strength", slider=True) row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE') + if brush.gpencil_vertex_tool in {'DRAW', 'REPLACE'}: + row = layout.row(align=True) + row.prop(gp_settings, "vertex_mode", text="Mode") + + classes = ( VIEW3D_MT_tools_projectpaint_clone, ) -- cgit v1.2.3