From ed971a19fad4ce0c8b81dc4613336eff9322bd20 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Thu, 21 Apr 2022 14:51:37 +0200 Subject: Curves: show sculpt tool settings in panels Ref T97444. Differential Revision: https://developer.blender.org/D14700 --- .../scripts/startup/bl_ui/properties_paint_common.py | 17 ++++++++++++++++- release/scripts/startup/bl_ui/space_view3d.py | 6 +++--- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'release/scripts/startup/bl_ui') diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index 064a99034d3..9a116aa1717 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -432,7 +432,7 @@ class FalloffPanel(BrushPanel): row.operator("brush.curve_preset", icon='LINCURVE', text="").shape = 'LINE' row.operator("brush.curve_preset", icon='NOCURVE', text="").shape = 'MAX' - if mode in {'SCULPT', 'PAINT_VERTEX', 'PAINT_WEIGHT'} and brush.sculpt_tool != 'POSE': + if mode in {'SCULPT', 'PAINT_VERTEX', 'PAINT_WEIGHT', 'SCULPT_CURVES'} and brush.sculpt_tool != 'POSE': col.separator() row = col.row(align=True) row.use_property_split = True @@ -823,6 +823,11 @@ def brush_shared_settings(layout, context, brush, popover=False): size = True strength = True + # Sculpt Curves # + if mode == 'SCULPT_CURVES': + size = True + strength = True + ### Draw settings. ### ups = context.scene.tool_settings.unified_paint_settings @@ -920,6 +925,16 @@ def brush_settings_advanced(layout, context, brush, popover=False): col.prop(brush, "use_original_plane", text="Plane") layout.separator() + elif mode == 'SCULPT_CURVES': + if brush.curves_sculpt_tool == 'ADD': + layout.prop(brush.curves_sculpt_settings, "add_amount") + layout.prop(brush.curves_sculpt_settings, "curve_length") + layout.prop(brush.curves_sculpt_settings, "interpolate_length") + layout.prop(brush.curves_sculpt_settings, "interpolate_shape") + elif brush.curves_sculpt_tool == 'GROW_SHRINK': + layout.prop(brush.curves_sculpt_settings, "scale_uniform") + layout.prop(brush.curves_sculpt_settings, "minimum_length") + # 3D and 2D Texture Paint. elif mode in {'PAINT_TEXTURE', 'PAINT_2D'}: capabilities = brush.image_paint_capabilities diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c08f520f95a..81ccdd82dd8 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -514,9 +514,9 @@ class _draw_tool_settings_context_mode: layout.prop(brush, "use_frontface") layout.prop(brush, "falloff_shape", expand=True) layout.prop(brush.curves_sculpt_settings, "add_amount") - layout.prop(tool_settings.curves_sculpt, "curve_length") - layout.prop(tool_settings.curves_sculpt, "interpolate_length") - layout.prop(tool_settings.curves_sculpt, "interpolate_shape") + layout.prop(brush.curves_sculpt_settings, "curve_length") + layout.prop(brush.curves_sculpt_settings, "interpolate_length") + layout.prop(brush.curves_sculpt_settings, "interpolate_shape") if brush.curves_sculpt_tool == 'GROW_SHRINK': layout.prop(brush, "direction", expand=True, text="") -- cgit v1.2.3