blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

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
This commit is contained in:
Antonio Vazquez 2019-07-20 22:57:47 +02:00
parent 92f6e60f46
commit 3ee246f614
Notes: blender-bot 2023-02-14 05:37:19 +01:00 
Referenced by issue #67338, GPencil: locking material leaves some attributes editable
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_ui/properties_material_gpencil.py
View File

@ -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':