From 8d0fc95fb6d50b5fbef5cf749621eb7f01aca8d1 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Tue, 1 Oct 2024 12:17:43 -0700 Subject: [PATCH] Cleanup: Make format Just the result of running Make Format --- scripts/startup/bl_operators/wm.py | 5 ++++- .../startup/bl_ui/space_toolsystem_toolbar.py | 1 - scripts/startup/bl_ui/space_view3d.py | 20 ++++++++++++++++--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/scripts/startup/bl_operators/wm.py b/scripts/startup/bl_operators/wm.py index 1316c93a3c6..b91b0cb58af 100644 --- a/scripts/startup/bl_operators/wm.py +++ b/scripts/startup/bl_operators/wm.py @@ -2416,7 +2416,9 @@ class WM_OT_tool_set_by_brush_type(Operator): tool_helper_cls = ToolSelectPanelHelper._tool_class_from_space_type(space_type) # Lookup a tool with a matching brush type (ignoring some specific ones). tool_id = "builtin.brush" - for item in ToolSelectPanelHelper._tools_flatten(tool_helper_cls.tools_from_context(context, mode=context.mode)): + for item in ToolSelectPanelHelper._tools_flatten( + tool_helper_cls.tools_from_context( + context, mode=context.mode)): if item is None: continue @@ -2444,6 +2446,7 @@ class WM_OT_tool_set_by_brush_type(Operator): self.report({'WARNING'}, rpt_("Tool {!r} not found for space {!r}").format(tool_id, space_type)) return {'CANCELLED'} + class WM_OT_toolbar(Operator): bl_idname = "wm.toolbar" bl_label = "Toolbar" diff --git a/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 56213e36bbe..8ea35145ddf 100644 --- a/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -3074,7 +3074,6 @@ class _defs_grease_pencil_sculpt: ) - class _defs_gpencil_weight: # No mode specific tools currently (only general ones). pass diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 7787059cfb5..d2b7e7b3140 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -240,11 +240,20 @@ class VIEW3D_HT_tool_header(Header): text=text, ) - if mode_string in {'EDIT_GREASE_PENCIL', 'PAINT_GREASE_PENCIL', 'SCULPT_GREASE_PENCIL', 'WEIGHT_GREASE_PENCIL', 'VERTEX_GREASE_PENCIL'}: + if mode_string in { + 'EDIT_GREASE_PENCIL', + 'PAINT_GREASE_PENCIL', + 'SCULPT_GREASE_PENCIL', + 'WEIGHT_GREASE_PENCIL', + 'VERTEX_GREASE_PENCIL'}: row = layout.row(align=True) row.prop(tool_settings, "use_grease_pencil_multi_frame_editing", text="") - if mode_string in {'EDIT_GREASE_PENCIL', 'SCULPT_GREASE_PENCIL', 'WEIGHT_GREASE_PENCIL', 'VERTEX_GREASE_PENCIL'}: + if mode_string in { + 'EDIT_GREASE_PENCIL', + 'SCULPT_GREASE_PENCIL', + 'WEIGHT_GREASE_PENCIL', + 'VERTEX_GREASE_PENCIL'}: sub = row.row(align=True) sub.active = tool_settings.use_grease_pencil_multi_frame_editing sub.popover( @@ -1085,7 +1094,12 @@ class VIEW3D_HT_header(Header): panel="VIEW3D_PT_gpencil_lock", ) - if mode_string in {'EDIT_GREASE_PENCIL', 'PAINT_GREASE_PENCIL', 'SCULPT_GREASE_PENCIL', 'WEIGHT_GREASE_PENCIL', 'VERTEX_GREASE_PENCIL'}: + if mode_string in { + 'EDIT_GREASE_PENCIL', + 'PAINT_GREASE_PENCIL', + 'SCULPT_GREASE_PENCIL', + 'WEIGHT_GREASE_PENCIL', + 'VERTEX_GREASE_PENCIL'}: grease_pencil = context.object.data layer = grease_pencil.layers.active group = grease_pencil.layer_groups.active