Rework: Sculpt Brush Select Pie #5

Merged
Demeter Dzadik merged 1 commits from brush_select_pie_rework into main 2024-08-21 02:31:03 +02:00
Showing only changes of commit a8306269d6 - Show all commits

View File

@ -7,12 +7,11 @@ import bpy
from bpy.types import Menu
from pathlib import Path
from .hotkeys import register_hotkey
from bl_ui.properties_paint_common import BrushAssetShelf
# Sculpt Pie Pie Menus - W
class PIE_MT_sculpt_brush_select(Menu):
bl_idname = "PIE_MT_sculpt_brush_select"
bl_label = "Sculpt Pie"
bl_label = "Sculpt Brush Select Pie"
def draw(self, context):
global brush_icons
@ -21,87 +20,165 @@ class PIE_MT_sculpt_brush_select(Menu):
pie.scale_y = 1.2
# 4 - LEFT
draw_brush_operator(pie, 'Crease', 'crease')
pie.operator(
'wm.call_menu_pie',
text=" Transform Brushes...",
icon_value=brush_icons['snake_hook'],
).name = PIE_MT_sculpt_brush_select_transform.bl_idname
# 6 - RIGHT
draw_brush_operator(pie, 'Blob', 'blob')
pie.operator(
'wm.call_menu_pie',
text=" Volume Brushes...",
icon_value=brush_icons['blob'],
).name = PIE_MT_sculpt_brush_select_volume.bl_idname
# 2 - BOTTOM
pie.menu(PIE_MT_sculpt_brush_select_misc.bl_idname, text="More Brushes")
if blender_uses_brush_assets():
sculpt_settings = context.tool_settings.sculpt
brush = sculpt_settings.brush
col = pie.column()
brush_row = col.row()
brush_row.scale_y = 0.75
brush_row.scale_x = 0.15
BrushAssetShelf.draw_popup_selector(brush_row, context, brush, show_name=False)
name_row = col.row().box()
if brush:
name_row.label(text=brush.name)
else:
pie.separator()
# 8 - TOP
draw_brush_operator(pie, 'Mask', 'mask')
# 7 - TOP - LEFT
draw_brush_operator(pie, 'Grab', 'grab')
# 9 - TOP - RIGHT
draw_brush_operator(pie, 'Draw', 'draw')
# 1 - BOTTOM - LEFT
pie.operator(
'wm.call_menu_pie',
text=" Contrast Brushes...",
icon_value=brush_icons['flatten'],
).name = PIE_MT_sculpt_brush_select_contrast.bl_idname
# 3 - BOTTOM - RIGHT
pie.operator(
'wm.call_menu_pie',
text=" Special Brushes...",
icon_value=brush_icons['draw_face_sets'],
).name = PIE_MT_sculpt_brush_select_special.bl_idname
class PIE_MT_sculpt_brush_select_contrast(Menu):
bl_idname = "PIE_MT_sculpt_brush_select_contrast"
bl_label = "Contrast Brushes"
def draw(self, context):
pie = self.layout.menu_pie()
# 4 - LEFT
draw_brush_operator(pie, 'Flatten/Contrast', 'flatten')
# 6 - RIGHT
draw_brush_operator(pie, 'Scrape/Fill', 'scrape')
# 2 - BOTTOM
draw_brush_operator(pie, 'Fill/Deepen', 'fill')
# 8 - TOP
draw_brush_operator(pie, 'Scrape Multiplane', 'multiplane_scrape')
# 7 - TOP - LEFT
pie.separator()
# 9 - TOP - RIGHT
pie.separator()
# 1 - BOTTOM - LEFT
draw_brush_operator(pie, 'Smooth', 'smooth')
# 3 - BOTTOM - RIGHT
class PIE_MT_sculpt_brush_select_transform(Menu):
bl_idname = "PIE_MT_sculpt_brush_select_transform"
bl_label = "Transform Brushes"
def draw(self, context):
pie = self.layout.menu_pie()
# 4 - LEFT
draw_brush_operator(pie, 'Elastic Deform', 'elastic_deform')
# 6 - RIGHT
draw_brush_operator(pie, 'Nudge', 'nudge')
# 2 - BOTTOM
draw_brush_operator(pie, 'Relax Slide', 'topology')
# 8 - TOP
draw_brush_operator(pie, 'Snake Hook', 'snake_hook')
# 7 - TOP - LEFT
draw_brush_operator(pie, 'Twist', 'rotate')
# 9 - TOP - RIGHT
draw_brush_operator(pie, 'Pose', 'pose')
# 1 - BOTTOM - LEFT
draw_brush_operator(pie, 'Pinch/Magnify', 'pinch')
# 3 - BOTTOM - RIGHT
draw_brush_operator(pie, 'Thumb', 'thumb')
class PIE_MT_sculpt_brush_select_volume(Menu):
bl_idname = "PIE_MT_sculpt_brush_select_volume"
bl_label = "Volume Brushes"
def draw(self, context):
pie = self.layout.menu_pie()
# 4 - LEFT
draw_brush_operator(pie, 'Blob', 'blob')
# 6 - RIGHT
draw_brush_operator(pie, 'Clay', 'clay')
# 9 - TOP - RIGHT
draw_brush_operator(pie, 'Clay Strips', 'clay_strips')
# 1 - BOTTOM - LEFT
# 2 - BOTTOM
draw_brush_operator(pie, 'Inflate/Deflate', 'inflate')
# 3 - BOTTOM - RIGHT
pie.menu(
PIE_MT_sculpt_brush_select_grab.bl_idname,
text=" Grab Brushes",
icon_value=brush_icons["grab"],
)
# Sculpt Pie 2
class PIE_MT_sculpt_brush_select_misc(Menu):
bl_idname = "PIE_MT_sculpt_brush_select_misc"
bl_label = "More Brushes"
def draw(self, context):
global brush_icons
layout = self.layout
layout.scale_y = 1.5
# 4 - LEFT
draw_brush_operator(layout, 'Smooth', 'smooth')
# 6 - RIGHT
draw_brush_operator(layout, 'Flatten/Contrast', 'flatten')
# 2 - BOTTOM
draw_brush_operator(layout, 'Scrape/Fill', 'scrape')
# 8 - TOP
draw_brush_operator(layout, 'Fill/Deepen', 'fill')
draw_brush_operator(pie, 'Draw Sharp', 'draw_sharp')
# 7 - TOP - LEFT
draw_brush_operator(layout, 'Pinch/Magnify', 'pinch')
draw_brush_operator(pie, 'Clay Strips', 'clay_strips')
# 9 - TOP - RIGHT
draw_brush_operator(layout, 'Layer', 'layer')
draw_brush_operator(pie, 'Crease', 'crease')
# 1 - BOTTOM - LEFT
draw_brush_operator(layout, 'Mask', 'mask')
draw_brush_operator(pie, 'Clay Thumb', 'clay_thumb')
# 3 - BOTTOM - RIGHT
draw_brush_operator(pie, 'Layer', 'layer')
# Sculpt Pie Three
class PIE_MT_sculpt_brush_select_grab(Menu):
bl_idname = "PIE_MT_sculpt_brush_select_grab"
bl_label = "Grab Brushes"
class PIE_MT_sculpt_brush_select_special(Menu):
bl_idname = "PIE_MT_sculpt_brush_select_special"
bl_label = "Special Brushes"
def draw(self, context):
global brush_icons
layout = self.layout
layout.scale_y = 1.5
pie = self.layout.menu_pie()
# 4 - LEFT
draw_brush_operator(layout, 'Grab', 'grab')
draw_brush_operator(pie, 'Cloth', 'cloth')
# 6 - RIGHT
draw_brush_operator(layout, 'Nudge', 'nudge')
draw_brush_operator(pie, 'Erase Multires Displacement', 'displacement_eraser')
# 2 - BOTTOM
draw_brush_operator(layout, 'Thumb', 'thumb')
draw_brush_operator(pie, 'Density', 'simplify')
# 8 - TOP
draw_brush_operator(layout, 'Snake Hook', 'snake_hook')
draw_brush_operator(pie, 'Paint', 'paint')
# 7 - TOP - LEFT
draw_brush_operator(layout, 'Twist', 'rotate')
draw_brush_operator(pie, 'Smear', 'smear')
# 9 - TOP - RIGHT
draw_brush_operator(pie, 'Face Set Paint', 'draw_face_sets')
# 1 - BOTTOM - LEFT
draw_brush_operator(pie, 'Boundary', 'boundary')
# 3 - BOTTOM - RIGHT
draw_brush_operator(pie, 'Smear Multires Displacement', 'displacement_smear')
def draw_brush_operator(layout, brush_name: str, brush_icon: str):
def blender_uses_brush_assets():
return 'asset_activate' in dir(bpy.ops.brush)
def draw_brush_operator(layout, brush_name: str, brush_icon: str=""):
"""Draw a brush select operator in the provided UI element with the pre-4.3 icons.
brush_name must match the name of the Brush Asset.
brush_icon must match the name of a file in this add-on's icons folder.
"""
if 'asset_activate' in dir(bpy.ops.brush):
if blender_uses_brush_assets():
# 4.3
op = layout.operator(
'brush.asset_activate',
text=" " + brush_name,
icon_value=brush_icons[brush_icon],
icon_value=brush_icons.get(brush_icon, 0),
)
op.asset_library_type = 'ESSENTIALS'
op.relative_asset_identifier = (
@ -109,12 +186,15 @@ def draw_brush_operator(layout, brush_name: str, brush_icon: str):
)
else:
# Pre-4.3
op = layout.operator(
"paint.brush_select",
text=" " + brush_name,
icon_value=brush_icons[brush_icon],
)
op.sculpt_tool = brush_icon.upper()
if brush_icon:
op = layout.operator(
"paint.brush_select",
text=" " + brush_name,
icon_value=brush_icons[brush_icon],
)
op.sculpt_tool = brush_icon.upper()
else:
layout.separator()
brush_icons = {}
@ -138,8 +218,10 @@ def release_icons():
registry = (
PIE_MT_sculpt_brush_select,
PIE_MT_sculpt_brush_select_misc,
PIE_MT_sculpt_brush_select_grab,
PIE_MT_sculpt_brush_select_contrast,
PIE_MT_sculpt_brush_select_transform,
PIE_MT_sculpt_brush_select_volume,
PIE_MT_sculpt_brush_select_special,
)