Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPencil: Join Tint and Vertex Color modifier

Browse Source 
Both are doing almost the same and can be merged. This reduce complexity for user and less code to maintain.

Reviewed By: mendio, pepeland, fclem

Differential Revision: https://developer.blender.org/D7134
This commit is contained in:
Antonio Vazquez
2020-03-13 10:28:30 +01:00
committed by Antonio Vazquez
parent df032580c1
commit de9c7bae7b
12 changed files with 321 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@@ -1891,16 +1891,34 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
self.gpencil_masking(layout, ob, md, True, True)
def GP_TINT(self, layout, ob, md):
split = layout.split()
layout.row().prop(md, "tint_type", expand=True)
col = split.column()
col.prop(md, "color")
col.prop(md, "factor")
if md.tint_type == 'UNIFORM':
col = layout.column()
col.prop(md, "color")
row = layout.row()
row.prop(md, "modify_color")
col.separator()
col.prop(md, "factor")
self.gpencil_masking(layout, ob, md, False, True)
if md.tint_type == 'GRADIENT':
col = layout.column()
col.label(text="Colors:")
col.template_color_ramp(md, "colors")
col.separator()
col.label(text="Object:")
col.prop(md, "object", text="")
col.separator()
row = col.row(align=True)
row.prop(md, "radius")
row.prop(md, "factor")
col.separator()
col.prop(md, "vertex_mode")
self.gpencil_masking(layout, ob, md, True, True)
def GP_TIME(self, layout, ob, md):
gpd = ob.data
@@ -2165,25 +2183,6 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
self.gpencil_masking(layout, ob, md, False)
def GP_VERTEXCOLOR(self, layout, ob, md):
col = layout.column()
col.label(text="Object:")
col.prop(md, "object", text="")
col.separator()
row = col.row(align=True)
row.prop(md, "radius")
row.prop(md, "factor", text="Strength", slider=True)
col.separator()
col.label(text="Colors:")
col.template_color_ramp(md, "colors")
col.separator()
col.prop(md, "vertex_mode")
self.gpencil_masking(layout, ob, md, True, True)
classes = (
DATA_PT_modifiers,