From e671c548e66e95d4fd1884c81c2dab1ae4a1a219 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 16 Dec 2020 18:02:40 +1100 Subject: Cleanup: pep8 --- release/scripts/startup/bl_operators/assets.py | 1 + .../scripts/startup/bl_operators/geometry_nodes.py | 3 +++ .../startup/bl_operators/object_quick_effects.py | 1 + .../bl_ui/properties_grease_pencil_common.py | 1 + .../startup/bl_ui/properties_paint_common.py | 1 - release/scripts/startup/bl_ui/space_filebrowser.py | 23 ++++++++++++++++++---- release/scripts/startup/bl_ui/space_image.py | 4 +--- release/scripts/startup/bl_ui/space_node.py | 1 - release/scripts/startup/bl_ui/space_properties.py | 6 ++++-- release/scripts/startup/bl_ui/space_sequencer.py | 6 +----- release/scripts/startup/bl_ui/space_time.py | 1 + release/scripts/startup/bl_ui/space_userpref.py | 2 +- release/scripts/startup/bl_ui/space_view3d.py | 1 + .../scripts/startup/bl_ui/space_view3d_toolbar.py | 1 + 14 files changed, 35 insertions(+), 17 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_operators/assets.py b/release/scripts/startup/bl_operators/assets.py index c317df78aa5..317555280e5 100644 --- a/release/scripts/startup/bl_operators/assets.py +++ b/release/scripts/startup/bl_operators/assets.py @@ -22,6 +22,7 @@ from bpy_extras.asset_utils import ( SpaceAssetInfo, ) + class ASSET_OT_tag_add(bpy.types.Operator): """Add a new keyword tag to the active asset""" diff --git a/release/scripts/startup/bl_operators/geometry_nodes.py b/release/scripts/startup/bl_operators/geometry_nodes.py index 7d7e3793dba..b94104d10a9 100644 --- a/release/scripts/startup/bl_operators/geometry_nodes.py +++ b/release/scripts/startup/bl_operators/geometry_nodes.py @@ -18,6 +18,7 @@ import bpy + def geometry_node_group_empty_new(context): group = bpy.data.node_groups.new("Geometry Nodes", 'GeometryNodeTree') group.inputs.new('NodeSocketGeometry', "Geometry") @@ -33,6 +34,7 @@ def geometry_node_group_empty_new(context): return group + def geometry_modifier_poll(context) -> bool: ob = context.object @@ -42,6 +44,7 @@ def geometry_modifier_poll(context) -> bool: return True + class NewGeometryNodesModifier(bpy.types.Operator): """Create a new modifier with a new geometry node group""" diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py index 8c275da28ac..0600536cb66 100644 --- a/release/scripts/startup/bl_operators/object_quick_effects.py +++ b/release/scripts/startup/bl_operators/object_quick_effects.py @@ -573,6 +573,7 @@ class QuickLiquid(Operator): return {'FINISHED'} + classes = ( QuickExplode, QuickFur, diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 8201ce080b1..c663a736441 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -893,6 +893,7 @@ class GreasePencilLayerDisplayPanel: row = layout.row(align=True) row.prop(gpl, "use_solo_mode", text="Show Only on Keyframed") + class GreasePencilFlipTintColors(Operator): bl_label = "Flip Colors" bl_idname = "gpencil.tint_flip" diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index 7e9e15c30da..86221ebce59 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -550,7 +550,6 @@ def brush_settings(layout, context, brush, popover=False): if context.preferences.experimental.use_sculpt_tools_tilt and capabilities.has_tilt: layout.prop(brush, "tilt_strength_factor", slider=True) - row = layout.row(align=True) row.prop(brush, "hardness", slider=True) row.prop(brush, "invert_hardness_pressure", text="") diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 527a5bc623e..15e2e3d02e0 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -267,7 +267,11 @@ class FILEBROWSER_PT_bookmarks_system(Panel): @classmethod def poll(cls, context): - return not context.preferences.filepaths.hide_system_bookmarks and panel_poll_is_upper_region(context.region) and not panel_poll_is_asset_browsing(context) + return ( + not context.preferences.filepaths.hide_system_bookmarks and + panel_poll_is_upper_region(context.region) and + not panel_poll_is_asset_browsing(context) + ) def draw(self, context): layout = self.layout @@ -301,7 +305,10 @@ class FILEBROWSER_PT_bookmarks_favorites(Panel): @classmethod def poll(cls, context): - return panel_poll_is_upper_region(context.region) and not panel_poll_is_asset_browsing(context) + return ( + panel_poll_is_upper_region(context.region) and + not panel_poll_is_asset_browsing(context) + ) def draw(self, context): layout = self.layout @@ -338,7 +345,11 @@ class FILEBROWSER_PT_bookmarks_recents(Panel): @classmethod def poll(cls, context): - return not context.preferences.filepaths.hide_recent_locations and panel_poll_is_upper_region(context.region) and not panel_poll_is_asset_browsing(context) + return ( + not context.preferences.filepaths.hide_recent_locations and + panel_poll_is_upper_region(context.region) and + not panel_poll_is_asset_browsing(context) + ) def draw(self, context): layout = self.layout @@ -362,7 +373,11 @@ class FILEBROWSER_PT_advanced_filter(Panel): @classmethod def poll(cls, context): # only useful in append/link (library) context currently... - return context.space_data.params.use_library_browsing and panel_poll_is_upper_region(context.region) and not panel_poll_is_asset_browsing(context) + return ( + context.space_data.params.use_library_browsing and + panel_poll_is_upper_region(context.region) and + not panel_poll_is_asset_browsing(context) + ) def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index f4e88b70281..342b72acb8c 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -1465,7 +1465,7 @@ class IMAGE_PT_overlay(Panel): bl_ui_units_x = 13 def draw(self, context): - pass + pass class IMAGE_PT_overlay_uv_edit(Panel): @@ -1496,7 +1496,6 @@ class IMAGE_PT_overlay_uv_edit(Panel): subrow.prop(uvedit, "display_stretch_type", text="") - class IMAGE_PT_overlay_uv_edit_geometry(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'HEADER' @@ -1529,7 +1528,6 @@ class IMAGE_PT_overlay_uv_edit_geometry(Panel): row.prop(uvedit, "show_faces", text="Faces") - class IMAGE_PT_overlay_texture_paint(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'HEADER' diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 1c4d1919f43..e6af83b61f4 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -168,7 +168,6 @@ class NODE_HT_header(Header): else: row.template_ID(snode, "node_tree", new="node.new_geometry_nodes_modifier") - else: # Custom node tree is edited as independent ID block NODE_MT_editor_menus.draw_collapsible(context, layout) diff --git a/release/scripts/startup/bl_ui/space_properties.py b/release/scripts/startup/bl_ui/space_properties.py index 0f64ab63d6b..765cab1ace2 100644 --- a/release/scripts/startup/bl_ui/space_properties.py +++ b/release/scripts/startup/bl_ui/space_properties.py @@ -61,8 +61,10 @@ class PROPERTIES_PT_navigation_bar(Panel): layout.scale_x = 1.4 layout.scale_y = 1.4 if view.search_filter: - layout.prop_tabs_enum(view, "context", data_highlight=view, - property_highlight="tab_search_results", icon_only=True) + layout.prop_tabs_enum( + view, "context", data_highlight=view, + property_highlight="tab_search_results", icon_only=True, + ) else: layout.prop_tabs_enum(view, "context", icon_only=True) diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 8ef961960ff..84602057e18 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -156,7 +156,6 @@ class SEQUENCER_HT_header(Header): if tool_settings.use_proportional_edit: row.prop(tool_settings, "proportional_edit_falloff", icon_only=True) - row = layout.row(align=True) row.prop(st, "show_strip_overlay", text="", icon='OVERLAY') sub = row.row(align=True) @@ -213,7 +212,6 @@ class SEQUENCER_PT_preview_overlay(Panel): st = context.space_data return st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'} and st.display_mode == 'IMAGE' - def draw(self, context): ed = context.scene.sequence_editor st = context.space_data @@ -224,7 +222,7 @@ class SEQUENCER_PT_preview_overlay(Panel): layout.prop(st, "show_safe_areas", text="Safe Areas") layout.prop(st, "show_metadata", text="Metadata") layout.prop(st, "show_annotation", text="Annotations") - + class SEQUENCER_PT_sequencer_overlay(Panel): bl_space_type = 'SEQUENCE_EDITOR' @@ -237,7 +235,6 @@ class SEQUENCER_PT_sequencer_overlay(Panel): st = context.space_data return st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'} - def draw(self, context): st = context.space_data layout = self.layout @@ -258,7 +255,6 @@ class SEQUENCER_PT_sequencer_overlay(Panel): layout.prop_menu_enum(st, "waveform_display_type") - class SEQUENCER_MT_view_cache(Menu): bl_label = "Cache" diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 16b02db9377..3b9ce5311f3 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -297,6 +297,7 @@ class TIME_PT_keyframing_settings(TimelinePanelButtons, Panel): col.label(text="New Keyframe Type") col.prop(tool_settings, "keyframe_type", text="") + class TIME_PT_auto_keyframing(TimelinePanelButtons, Panel): bl_label = "Auto Keyframing" bl_options = {'HIDE_HEADER'} diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 1d59fe4bfa2..1d9d4fbf393 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -211,7 +211,7 @@ class USERPREF_PT_interface_display(InterfacePanel, CenterAlignMixIn, Panel): col.separator() col = layout.column(heading="Tooltips", align=True) - col.prop(view, "show_tooltips", text = "User Tooltips") + col.prop(view, "show_tooltips", text="User Tooltips") sub = col.column() sub.active = view.show_tooltips sub.prop(view, "show_tooltips_python") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c97d5601a10..8b5183faf62 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -5306,6 +5306,7 @@ class VIEW3D_MT_sculpt_mask_edit_pie(Menu): op.filter_type = 'CONTRAST_DECREASE' op.auto_iteration_count = False + class VIEW3D_MT_sculpt_automasking_pie(Menu): bl_label = "Automasking" diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 293d55a6015..577f9678a62 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -966,6 +966,7 @@ class VIEW3D_PT_tools_weightpaint_symmetry(Panel, View3DPaintPanel): row.active = mesh.use_mirror_vertex_group_x row.prop(mesh, "use_mirror_topology") + class VIEW3D_PT_tools_weightpaint_symmetry_for_topbar(Panel): bl_space_type = 'TOPBAR' bl_region_type = 'HEADER' -- cgit v1.2.3