diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-10 02:10:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-10 02:12:23 +0300 |
| commit | 609d4f5c92c76bd62fe77e880e38ae8528419b0a (patch) | |
| tree | 13276dd5f61befc601e0bcad11a2cad27209a2b9 /release/scripts/startup/bl_ui/space_topbar.py | |
| parent | eb3886c7ac832346c412bfccbfd32ba4b6f0a421 (diff) | |
Fix T60354: Paint color shown when not used
Add 'has_color' check to avoid duplicated tool checks.
Also abbreviate text descriptions.
Diffstat (limited to 'release/scripts/startup/bl_ui/space_topbar.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 94965e5d03d..06a6e3dc5ac 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -257,7 +257,9 @@ class _draw_left_context_mode: UnifiedPaintPanel, brush_basic_texpaint_settings, ) - UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text="") + capabilities = brush.image_paint_capabilities + if capabilities.has_color: + UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text="") brush_basic_texpaint_settings(layout, context, brush, compact=True) @staticmethod @@ -276,7 +278,9 @@ class _draw_left_context_mode: UnifiedPaintPanel, brush_basic_vpaint_settings, ) - UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text="") + capabilities = brush.vertex_paint_capabilities + if capabilities.has_color: + UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text="") brush_basic_vpaint_settings(layout, context, brush, compact=True) @staticmethod @@ -453,7 +457,9 @@ class _draw_left_context_mode: UnifiedPaintPanel, brush_basic_texpaint_settings, ) - UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text="") + capabilities = brush.image_paint_capabilities + if capabilities.has_color: + UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text="") brush_basic_texpaint_settings(layout, context, brush, compact=True) |