diff options
| author | Antonioya <blendergit@gmail.com> | 2016-09-17 10:01:09 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2016-09-17 10:02:03 +0300 |
| commit | 09925d52f5867dbe91dc867e404e248c9a92295a (patch) | |
| tree | a0de99f849a78a21b46fad019669d6a0ef051a9b | |
| parent | cade262c472374dc397311dabd900c8763598c70 (diff) | |
Fix T49383: Color pickers are available if the color is locked
If the color is locked, the row is disabled, but the picker is still
available.
This error was present in older versions for layer color.
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 8 |
1 files changed, 6 insertions, 2 deletions
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 feff5d4f829..04931b70ff1 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -491,6 +491,7 @@ class GPENCIL_PIE_settings_palette(Menu): # W - Stroke draw settings col = pie.column(align=True) if palcolor is not None: + col.enabled = not palcolor.lock col.label(text="Stroke") col.prop(palcolor, "color", text="") col.prop(palcolor, "alpha", text="", slider=True) @@ -498,6 +499,7 @@ class GPENCIL_PIE_settings_palette(Menu): # E - Fill draw settings col = pie.column(align=True) if palcolor is not None: + col.enabled = not palcolor.lock col.label(text="Fill") col.prop(palcolor, "fill_color", text="") col.prop(palcolor, "fill_alpha", text="", slider=True) @@ -700,6 +702,7 @@ class GPENCIL_UL_palettecolor(UIList): split = layout.split(percentage=0.25) row = split.row(align=True) + row.enabled = not palcolor.lock row.prop(palcolor, "color", text="", emboss=palcolor.is_stroke_visible) row.prop(palcolor, "fill_color", text="", emboss=palcolor.is_fill_visible) split.prop(palcolor, "name", text="", emboss=False) @@ -888,6 +891,7 @@ class GreasePencilDataPanel: col = split.column() subcol = col.column(align=True) subcol.label("Tint") + subcol.enabled = not gpl.lock subcol.prop(gpl, "tint_color", text="") subcol.prop(gpl, "tint_factor", text="Factor", slider=True) @@ -1025,14 +1029,14 @@ class GreasePencilPaletteColorPanel: # Column 1 - Stroke col = split.column(align=True) - col.active = not pcolor.lock + col.enabled = not pcolor.lock col.label(text="Stroke:") col.prop(pcolor, "color", text="") col.prop(pcolor, "alpha", slider=True) # Column 2 - Fill col = split.column(align=True) - col.active = not pcolor.lock + col.enabled = not pcolor.lock col.label(text="Fill:") col.prop(pcolor, "fill_color", text="") col.prop(pcolor, "fill_alpha", text="Opacity", slider=True) |