[Bf-blender-cvs] [b770e6e0f42] greasepencil-object: GPencil: More tweaks to Vertex Color panels
Antonio Vazquez
noreply at git.blender.org
Thu Feb 27 16:27:25 CET 2020
Commit: b770e6e0f423f65976c1e9331aed85abbdae3107
Author: Antonio Vazquez
Date: Thu Feb 27 16:22:44 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb770e6e0f423f65976c1e9331aed85abbdae3107
GPencil: More tweaks to Vertex Color panels
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index b8bbe9d1d18..1c6f59038e2 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -434,9 +434,11 @@ class _draw_tool_settings_context_mode:
if brush.gpencil_tool in {'DRAW', 'FILL'} and ma:
row.separator(factor=1.0)
- row.prop(settings, "use_vertex_color", text="", expand=True)
+ subrow = row.row(align=True)
+ row.prop_enum(settings, "color_mode", 'MATERIAL', text="", icon='MATERIAL')
+ row.prop_enum(settings, "color_mode", 'VERTEXCOLOR', text="", icon='VPAINT_HLT')
sub_row = row.row(align=True)
- sub_row.enabled = settings.use_vertex_color == 'VERTEXCOLOR'
+ sub_row.enabled = settings.color_mode == 'VERTEXCOLOR'
sub_row.prop_with_popover(brush, "color", text="", panel="TOPBAR_PT_gpencil_vertexcolor")
row = layout.row(align=True)
@@ -6868,7 +6870,7 @@ class VIEW3D_PT_gpencil_draw_context_menu(Panel):
layout = self.layout
- if brush.gpencil_tool not in {'ERASE', 'CUTTER', 'EYEDROPPER'} and settings.use_vertex_color == 'VERTEXCOLOR':
+ if brush.gpencil_tool not in {'ERASE', 'CUTTER', 'EYEDROPPER'} and settings.color_mode == 'VERTEXCOLOR':
split = layout.split(factor=0.1)
split.prop(brush, "color", text="")
split.template_color_picker(brush, "color", value_slider=True)
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 4e6e6e3d148..0f8038a868a 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2096,7 +2096,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_vertex_palette(View3DPanel, Panel):
class VIEW3D_PT_tools_grease_pencil_brush_mixcolor(View3DPanel, Panel):
bl_context = ".greasepencil_paint"
- bl_label = "Paint Mode"
+ bl_label = "Color"
bl_category = "Tool"
bl_options = {'DEFAULT_CLOSED'}
@@ -2121,25 +2121,21 @@ class VIEW3D_PT_tools_grease_pencil_brush_mixcolor(View3DPanel, Panel):
return True
- def draw_header(self, context):
+ def draw(self, context):
+ layout = self.layout
ts = context.tool_settings
settings = ts.gpencil_paint
brush = settings.brush
+ gp_settings = brush.gpencil_settings
if brush.gpencil_tool != 'TINT':
- self.layout.prop(settings, "use_vertex_color", text="", expand=True)
+ row = layout.row()
+ row.prop(settings, "color_mode", expand=True)
- def draw(self, context):
- layout = self.layout
layout.use_property_split = True
layout.use_property_decorate = False
- ts = context.tool_settings
- settings = ts.gpencil_paint
- brush = settings.brush
- gp_settings = brush.gpencil_settings
-
col = layout.column()
- col.enabled = settings.use_vertex_color == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT'
+ col.enabled = settings.color_mode == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT'
col.template_color_picker(brush, "color", value_slider=True)
@@ -2159,7 +2155,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_mixcolor(View3DPanel, Panel):
class VIEW3D_PT_tools_grease_pencil_brush_mix_palette(View3DPanel, Panel):
bl_context = ".greasepencil_paint"
- bl_label = "Color Palette"
+ bl_label = "Palette"
bl_category = "Tool"
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_mixcolor'
bl_options = {'DEFAULT_CLOSED'}
@@ -2191,7 +2187,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_mix_palette(View3DPanel, Panel):
brush = settings.brush
col = layout.column()
- col.enabled = settings.use_vertex_color == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT'
+ col.enabled = settings.color_mode == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT'
row = col.row(align=True)
row.template_ID(settings, "palette", new="palette.new")
@@ -2252,7 +2248,7 @@ classes = (
VIEW3D_PT_tools_curveedit_options_stroke,
VIEW3D_PT_tools_armatureedit_options,
VIEW3D_PT_tools_posemode_options,
-
+
VIEW3D_PT_slots_projectpaint,
VIEW3D_PT_tools_brush_select,
VIEW3D_PT_tools_brush_settings,
@@ -2292,7 +2288,7 @@ classes = (
VIEW3D_PT_tools_imagepaint_symmetry,
VIEW3D_PT_tools_imagepaint_options,
-
+
VIEW3D_PT_tools_imagepaint_options_external,
VIEW3D_MT_tools_projectpaint_stencil,
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index bca9d997fdf..85a2e5809cd 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -86,12 +86,12 @@ static const EnumPropertyItem rna_enum_gpencil_lock_axis_items[] = {
static const EnumPropertyItem rna_enum_gpencil_paint_mode[] = {
{GPPAINT_FLAG_USE_MATERIAL,
"MATERIAL",
- ICON_MATERIAL,
+ 0,
"Material",
"Paint using the active material base color"},
{GPPAINT_FLAG_USE_VERTEXCOLOR,
"VERTEXCOLOR",
- ICON_VPAINT_HLT,
+ 0,
"Vertex Color",
"Paint the material with custom vertex color"},
{0, NULL, 0, NULL, NULL},
@@ -860,7 +860,7 @@ static void rna_def_gp_paint(BlenderRNA *brna)
RNA_def_struct_ui_text(srna, "Grease Pencil Paint", "");
/* Use vertex color (main swith). */
- prop = RNA_def_property(srna, "use_vertex_color", PROP_ENUM, PROP_NONE);
+ prop = RNA_def_property(srna, "color_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "mode");
RNA_def_property_enum_items(prop, rna_enum_gpencil_paint_mode);
RNA_def_property_ui_text(prop, "Mode", "Paint Mode");
More information about the Bf-blender-cvs
mailing list