diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_paint_common.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_paint_common.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index d5f48876491..135ba802655 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -1148,11 +1148,19 @@ def brush_basic__draw_color_selector(context, layout, brush, gp_settings, props) if brush.gpencil_tool in {'DRAW', 'FILL'}: row.separator(factor=1.0) - row.prop_enum(settings, "color_mode", 'MATERIAL', text="", icon='MATERIAL') - row.prop_enum(settings, "color_mode", 'VERTEXCOLOR', text="", icon='VPAINT_HLT') sub_row = row.row(align=True) - sub_row.enabled = settings.color_mode == 'VERTEXCOLOR' + sub_row.enabled = not gp_settings.pin_draw_mode + if gp_settings.pin_draw_mode: + sub_row.prop_enum(gp_settings, "brush_draw_mode", 'MATERIAL', text="", icon='MATERIAL') + sub_row.prop_enum(gp_settings, "brush_draw_mode", 'VERTEXCOLOR', text="", icon='VPAINT_HLT') + else: + sub_row.prop_enum(settings, "color_mode", 'MATERIAL', text="", icon='MATERIAL') + sub_row.prop_enum(settings, "color_mode", 'VERTEXCOLOR', text="", icon='VPAINT_HLT') + + sub_row = row.row(align=True) + sub_row.enabled = settings.color_mode == 'VERTEXCOLOR' or gp_settings.brush_draw_mode == 'VERTEXCOLOR' sub_row.prop_with_popover(brush, "color", text="", panel="TOPBAR_PT_gpencil_vertexcolor") + row.prop(gp_settings, "pin_draw_mode", text="") if props: row = layout.row(align=True) |