Cleanup: GPv3: Separate weight paint context menu class

The paint, sculpt, and vertex-paint modes already have separate context
menu classes from GPv2. The GPv2 classes will be removed, this is just
a small refactor to prevent this change from getting lost in a big
cleanup PR. No functional changes.

Pull Request: https://projects.blender.org/blender/blender/pulls/128530
This commit is contained in:
Lukas Tönne
2024-10-03 13:42:54 +02:00
parent 3a070122ea
commit 7cb0e8a558
2 changed files with 22 additions and 6 deletions

View File

@@ -3953,7 +3953,7 @@ def km_grease_pencil_weight_paint(params):
# Sample weight
("grease_pencil.weight_sample", {"type": 'X', "value": 'PRESS', "shift": True}, None),
# Context menu
*_template_items_context_panel("VIEW3D_PT_gpencil_weight_context_menu", params.context_menu_event),
*_template_items_context_panel("VIEW3D_PT_greasepencil_weight_context_menu", params.context_menu_event),
# Show/hide layer
*_template_items_hide_reveal_actions("grease_pencil.layer_hide", "grease_pencil.layer_reveal"),

View File

@@ -9042,6 +9042,25 @@ class VIEW3D_PT_greasepencil_vertex_paint_context_menu(Panel):
row.operator("grease_pencil.layer_remove", text="", icon='X')
class VIEW3D_PT_greasepencil_weight_context_menu(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'WINDOW'
bl_label = "Weight Paint"
bl_ui_units_x = 12
def draw(self, context):
tool_settings = context.tool_settings
settings = tool_settings.gpencil_weight_paint
brush = settings.brush
layout = self.layout
# Weight settings
brush_basic_grease_pencil_weight_settings(layout, context, brush)
# Layers
draw_gpencil_layer_active(context, layout)
def draw_gpencil_layer_active(context, layout):
gpl = context.active_gpencil_layer
if gpl:
@@ -9119,11 +9138,7 @@ class VIEW3D_PT_gpencil_weight_context_menu(Panel):
layout = self.layout
# Weight settings
if context.mode == 'WEIGHT_GPENCIL':
brush_basic_gpencil_weight_settings(layout, context, brush)
else:
# Grease Pencil v3
brush_basic_grease_pencil_weight_settings(layout, context, brush)
brush_basic_gpencil_weight_settings(layout, context, brush)
# Layers
draw_gpencil_layer_active(context, layout)
@@ -9987,6 +10002,7 @@ classes = (
VIEW3D_PT_greasepencil_draw_context_menu,
VIEW3D_PT_greasepencil_sculpt_context_menu,
VIEW3D_PT_greasepencil_vertex_paint_context_menu,
VIEW3D_PT_greasepencil_weight_context_menu,
)