diff options
Diffstat (limited to 'release/scripts/startup')
5 files changed, 44 insertions, 37 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 99508bf8fab..bcf1c285d2b 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -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, diff --git a/release/scripts/startup/bl_ui/properties_data_shaderfx.py b/release/scripts/startup/bl_ui/properties_data_shaderfx.py index 48a851e8bef..1d4bf37b282 100644 --- a/release/scripts/startup/bl_ui/properties_data_shaderfx.py +++ b/release/scripts/startup/bl_ui/properties_data_shaderfx.py @@ -56,7 +56,7 @@ class DATA_PT_shader_fx(ShaderFxButtonsPanel, Panel): def FX_BLUR(self, layout, fx): - layout.prop(fx, "use_dof_mode", text="Use as Depth Of Field") + layout.prop(fx, "use_dof_mode", text="Use Depth of Field") layout.separator() col = layout.column() @@ -98,7 +98,7 @@ class DATA_PT_shader_fx(ShaderFxButtonsPanel, Panel): layout.prop(fx, "rim_color") layout.prop(fx, "mask_color") - layout.prop(fx, "mode") + layout.prop(fx, "mode", text="Blend") layout.prop(fx, "blur") layout.prop(fx, "samples") @@ -114,7 +114,7 @@ class DATA_PT_shader_fx(ShaderFxButtonsPanel, Panel): layout.prop(fx, "samples") layout.separator() - layout.prop(fx, "use_object", text="Use Object As Pivot") + layout.prop(fx, "use_object", text="Use Object as Pivot") if fx.use_object: row = layout.row() row.prop(fx, "object", text="Object") 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 fced848641e..95997b48680 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -632,8 +632,8 @@ class GreasePencilMaterialsPanel: if ob.data.use_stroke_edit_mode: row = layout.row(align=True) row.operator("gpencil.stroke_change_color", text="Assign") - row.operator("gpencil.color_select", text="Select").deselect = False - row.operator("gpencil.color_select", text="Deselect").deselect = True + row.operator("gpencil.select_material", text="Select").deselect = False + row.operator("gpencil.select_material", text="Deselect").deselect = True # stroke color ma = None if is_view3d and brush is not None: @@ -692,10 +692,6 @@ class GreasePencilVertexcolorPanel: row = layout.row(align=True) row.prop(gp_settings, "vertex_color_factor", slider=True, text="Mix Factor") - if tool == 'TINT' or is_vertex is True: - row = layout.row(align=True) - row.prop(gp_settings, "vertex_mode", text="Mode") - class GPENCIL_UL_layer(UIList): def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index): diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index b50791050c4..34afcc09407 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -1065,13 +1065,16 @@ def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False) row = layout.row(align=True) row.prop(gp_settings, "fill_simplify_level", text="Simplify") - else: # brush.gpencil_tool == 'DRAW': + else: # brush.gpencil_tool == 'DRAW/TINT': row = layout.row(align=True) row.prop(brush, "size", text="Radius") row.prop(gp_settings, "use_pressure", text="", icon='STYLUS_PRESSURE') row = layout.row(align=True) row.prop(gp_settings, "pen_strength", slider=True) row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE') + if brush.gpencil_tool == 'TINT': + row = layout.row(align=True) + row.prop(gp_settings, "vertex_mode", text="Mode") # FIXME: tools must use their own UI drawing! if tool.idname in { @@ -1159,6 +1162,11 @@ def brush_basic_gpencil_vertex_settings(layout, _context, brush, *, compact=Fals row.prop(gp_settings, "pen_strength", slider=True) row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE') + if brush.gpencil_vertex_tool in {'DRAW', 'REPLACE'}: + row = layout.row(align=True) + row.prop(gp_settings, "vertex_mode", text="Mode") + + classes = ( VIEW3D_MT_tools_projectpaint_clone, ) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 969f9b4bd1a..f8b291c0c5f 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1902,6 +1902,9 @@ class VIEW3D_MT_select_gpencil(Menu): layout.operator("gpencil.select_alternate") layout.operator_menu_enum("gpencil.select_grouped", "type", text="Grouped") + if _context.mode == 'VERTEX_GPENCIL': + layout.operator("gpencil.select_vertex_color", text="Vertex Color") + layout.separator() layout.operator("gpencil.select_first") @@ -6948,8 +6951,9 @@ class VIEW3D_PT_gpencil_draw_context_menu(Panel): gp_settings = brush.gpencil_settings layout = self.layout + is_vertex = settings.color_mode == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT' - if brush.gpencil_tool not in {'ERASE', 'CUTTER', 'EYEDROPPER'} and settings.color_mode == 'VERTEXCOLOR': + if brush.gpencil_tool not in {'ERASE', 'CUTTER', 'EYEDROPPER'} and is_vertex: split = layout.split(factor=0.1) split.prop(brush, "color", text="") split.template_color_picker(brush, "color", value_slider=True) |