From 3ee246f614caaa8fa88b0c7813730fc35b7718e6 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Sat, 20 Jul 2019 22:57:47 +0200 Subject: [PATCH] Fix T67338 : GPencil Disable material properties when material is locked When the material was locked, the properties were deactivated but not disabled. Differential Revision: http://developer.blender.org/D5309 --- .../scripts/startup/bl_ui/properties_material_gpencil.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py index 29a89c7b4a3..8db0f8182ab 100644 --- a/release/scripts/startup/bl_ui/properties_material_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py @@ -120,6 +120,7 @@ class MATERIAL_PT_gpencil_strokecolor(GPMaterialButtonsPanel, Panel): ma = context.material if ma is not None and ma.grease_pencil is not None: gpcolor = ma.grease_pencil + self.layout.enabled = not gpcolor.lock self.layout.prop(gpcolor, "show_stroke", text="") def draw(self, context): @@ -131,7 +132,7 @@ class MATERIAL_PT_gpencil_strokecolor(GPMaterialButtonsPanel, Panel): gpcolor = ma.grease_pencil col = layout.column() - col.active = not gpcolor.lock + col.enabled = not gpcolor.lock col.prop(gpcolor, "mode") @@ -169,6 +170,7 @@ class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel): def draw_header(self, context): ma = context.material gpcolor = ma.grease_pencil + self.layout.enabled = not gpcolor.lock self.layout.prop(gpcolor, "show_fill", text="") def draw(self, context): @@ -180,7 +182,7 @@ class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel): # color settings col = layout.column() - col.active = not gpcolor.lock + col.enabled = not gpcolor.lock col.prop(gpcolor, "fill_style", text="Style") if gpcolor.fill_style == 'GRADIENT':