From c02784bd4f63847dda8cdaa4669d6895aa76e2ca Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 11 Dec 2023 15:46:55 -0500 Subject: [PATCH] Cleanup: Make format --- .../keyconfig/keymap_data/blender_default.py | 2 + .../startup/bl_ui/space_toolsystem_toolbar.py | 94 ++++++++++--------- 2 files changed, 50 insertions(+), 46 deletions(-) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index 6fe4cccdb0c..c1514c6d649 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -7723,6 +7723,7 @@ def km_3d_view_tool_edit_curve_draw(params): ]}, ) + def km_3d_view_tool_edit_curves_draw(params): return ( "3D View Tool: Edit Curves, Draw", @@ -7734,6 +7735,7 @@ def km_3d_view_tool_edit_curves_draw(params): ]}, ) + def km_3d_view_tool_edit_curve_pen(params): return ( "3D View Tool: Edit Curve, Curve Pen", diff --git a/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 341e4b031b3..c12ef7336cd 100644 --- a/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1149,59 +1149,59 @@ class _defs_edit_mesh: def curve_draw_settings(context, layout, _tool, *, extra=False): - # Tool settings initialize operator options. - tool_settings = context.tool_settings - cps = tool_settings.curve_paint_settings - region_type = context.region.type + # Tool settings initialize operator options. + tool_settings = context.tool_settings + cps = tool_settings.curve_paint_settings + region_type = context.region.type - if region_type == 'TOOL_HEADER': - if not extra: - layout.prop(cps, "curve_type", text="") - layout.prop(cps, "depth_mode", expand=True) - layout.popover("TOPBAR_PT_tool_settings_extra", text="...") - return + if region_type == 'TOOL_HEADER': + if not extra: + layout.prop(cps, "curve_type", text="") + layout.prop(cps, "depth_mode", expand=True) + layout.popover("TOPBAR_PT_tool_settings_extra", text="...") + return - layout.use_property_split = True - layout.use_property_decorate = False + layout.use_property_split = True + layout.use_property_decorate = False + if region_type != 'TOOL_HEADER': + layout.prop(cps, "curve_type") + layout.separator() + if cps.curve_type == 'BEZIER': + layout.prop(cps, "fit_method") + layout.prop(cps, "error_threshold") if region_type != 'TOOL_HEADER': - layout.prop(cps, "curve_type") - layout.separator() - if cps.curve_type == 'BEZIER': - layout.prop(cps, "fit_method") - layout.prop(cps, "error_threshold") - if region_type != 'TOOL_HEADER': - row = layout.row(heading="Detect Corners", align=True) - else: - row = layout.row(heading="Corners", align=True) - row.prop(cps, "use_corners_detect", text="") - sub = row.row(align=True) - sub.active = cps.use_corners_detect - sub.prop(cps, "corner_angle", text="") - layout.separator() + row = layout.row(heading="Detect Corners", align=True) + else: + row = layout.row(heading="Corners", align=True) + row.prop(cps, "use_corners_detect", text="") + sub = row.row(align=True) + sub.active = cps.use_corners_detect + sub.prop(cps, "corner_angle", text="") + layout.separator() - col = layout.column(align=True) - col.prop(cps, "radius_taper_start", text="Taper Start", slider=True) - col.prop(cps, "radius_taper_end", text="End", slider=True) - col = layout.column(align=True) - col.prop(cps, "radius_min", text="Radius Min") - col.prop(cps, "radius_max", text="Max") - col.prop(cps, "use_pressure_radius") + col = layout.column(align=True) + col.prop(cps, "radius_taper_start", text="Taper Start", slider=True) + col.prop(cps, "radius_taper_end", text="End", slider=True) + col = layout.column(align=True) + col.prop(cps, "radius_min", text="Radius Min") + col.prop(cps, "radius_max", text="Max") + col.prop(cps, "use_pressure_radius") - if region_type != 'TOOL_HEADER' or cps.depth_mode == 'SURFACE': - layout.separator() + if region_type != 'TOOL_HEADER' or cps.depth_mode == 'SURFACE': + layout.separator() - if region_type != 'TOOL_HEADER': - row = layout.row() - row.prop(cps, "depth_mode", expand=True) - if cps.depth_mode == 'SURFACE': - col = layout.column() - col.prop(cps, "surface_offset") - col.prop(cps, "use_offset_absolute") - col.prop(cps, "use_stroke_endpoints") - if cps.use_stroke_endpoints: - colsub = layout.column(align=True) - colsub.prop(cps, "surface_plane") + if region_type != 'TOOL_HEADER': + row = layout.row() + row.prop(cps, "depth_mode", expand=True) + if cps.depth_mode == 'SURFACE': + col = layout.column() + col.prop(cps, "surface_offset") + col.prop(cps, "use_offset_absolute") + col.prop(cps, "use_stroke_endpoints") + if cps.use_stroke_endpoints: + colsub = layout.column(align=True) + colsub.prop(cps, "surface_plane") class _defs_edit_curve: @@ -1295,6 +1295,7 @@ class _defs_edit_curve: draw_settings=draw_settings, ) + class _defs_edit_curves: @ToolDef.from_fn @@ -1317,6 +1318,7 @@ class _defs_edit_curves: draw_settings=curve_draw, ) + class _defs_edit_text: @ToolDef.from_fn