diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-10-02 03:10:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-10-02 04:59:16 +0300 |
commit | bab9de2a52929fe2b45ecddb1eb09da3378e303b (patch) | |
tree | cde61c5cb86dfad1c90aa414a8c7b1711ec25782 /release/scripts/startup | |
parent | 28ebe827e60c84ed4731a9f8aa701ccf2d8be0b0 (diff) |
Cleanup: pep8, blank lines
Diffstat (limited to 'release/scripts/startup')
18 files changed, 26 insertions, 14 deletions
diff --git a/release/scripts/startup/bl_app_templates_system/2D_Animation/__init__.py b/release/scripts/startup/bl_app_templates_system/2D_Animation/__init__.py index 1892bea41f7..9b0a260dc95 100644 --- a/release/scripts/startup/bl_app_templates_system/2D_Animation/__init__.py +++ b/release/scripts/startup/bl_app_templates_system/2D_Animation/__init__.py @@ -63,6 +63,7 @@ def load_handler(dummy): gpd = ob.data gpd.onion_keyframe_type = 'ALL' + def register(): bpy.app.handlers.load_factory_startup_post.append(load_handler) diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 87a006be673..73212d6641a 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -208,7 +208,6 @@ class SelectHierarchy(Operator): select_new.sort(key=lambda obj_iter: obj_iter.name) act_new = select_new[0] - # don't edit any object settings above this if select_new: if not self.extend: diff --git a/release/scripts/startup/bl_operators/simulation.py b/release/scripts/startup/bl_operators/simulation.py index 5d9c9476318..0981baa5941 100644 --- a/release/scripts/startup/bl_operators/simulation.py +++ b/release/scripts/startup/bl_operators/simulation.py @@ -18,6 +18,7 @@ import bpy + class NewSimulation(bpy.types.Operator): """Create a new simulation data block and edit it in the opened simulation editor""" @@ -34,6 +35,7 @@ class NewSimulation(bpy.types.Operator): context.space_data.simulation = simulation return {'FINISHED'} + classes = ( NewSimulation, ) diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py index f92a231f1da..113e6b06153 100644 --- a/release/scripts/startup/bl_operators/userpref.py +++ b/release/scripts/startup/bl_operators/userpref.py @@ -49,6 +49,7 @@ def module_filesystem_remove(path_base, module_name): else: os.remove(f_full) + # This duplicates shutil.copytree from Python 3.8, with the new dirs_exist_ok # argument that we need. Once we upgrade to 3.8 we can remove this. def _preferences_copytree(entries, src, dst): @@ -85,11 +86,13 @@ def _preferences_copytree(entries, src, dst): raise Error(errors) return dst + def preferences_copytree(src, dst): import os with os.scandir(src) as entries: return _preferences_copytree(entries=entries, src=src, dst=dst) + class PREFERENCES_OT_keyconfig_activate(Operator): bl_idname = "preferences.keyconfig_activate" bl_label = "Activate Keyconfig" diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 89d3a2c449b..e9a658bdc10 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1381,7 +1381,6 @@ class WM_OT_properties_edit(Operator): is_overridable = item.is_property_overridable_library('["%s"]' % self.property) self.is_overridable_library = bool(is_overridable) - # default default value prop_type, is_array = rna_idprop_value_item_type(self.get_value_eval()) if prop_type in {int, float}: diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py index 14619ef916d..f46e9f9727f 100644 --- a/release/scripts/startup/bl_ui/properties_constraint.py +++ b/release/scripts/startup/bl_ui/properties_constraint.py @@ -374,7 +374,6 @@ class ConstraintButtonsPanel(Panel): subsub.prop(con, "max_z", text="") row.prop_decorator(con, "max_z") - layout.prop(con, "use_transform_limit") layout.prop(con, "owner_space") @@ -752,7 +751,6 @@ class ConstraintButtonsPanel(Panel): row.active = not con.use_3d_position row.prop(con, "use_undistorted_position") - if not con.use_active_clip: layout.prop(con, "clip") @@ -1152,6 +1150,7 @@ class BONE_PT_bChildOfConstraint(BoneConstraintPanel, ConstraintButtonsPanel): # Track To Constraint + class OBJECT_PT_bTrackToConstraint(ObjectConstraintPanel, ConstraintButtonsPanel): def draw(self, context): self.draw_trackto(context) @@ -1163,6 +1162,7 @@ class BONE_PT_bTrackToConstraint(BoneConstraintPanel, ConstraintButtonsPanel): # Follow Path Constraint + class OBJECT_PT_bFollowPathConstraint(ObjectConstraintPanel, ConstraintButtonsPanel): def draw(self, context): self.draw_follow_path(context) @@ -1530,12 +1530,12 @@ class OBJECT_PT_bPythonConstraint(ObjectConstraintPanel, ConstraintButtonsPanel) def draw(self, context): self.draw_python_constraint(context) + class BONE_PT_bPythonConstraint(BoneConstraintPanel, ConstraintButtonsPanel): def draw(self, context): self.draw_python_constraint(context) - # Armature Constraint class OBJECT_PT_bArmatureConstraint(ObjectConstraintPanel, ConstraintButtonsPanel): @@ -1576,7 +1576,6 @@ class BONE_PT_bKinematicConstraint(BoneConstraintPanel, ConstraintButtonsPanel): self.draw_kinematic(context) - classes = ( # Object Panels OBJECT_PT_constraints, diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index 80bd8347421..b56182bb637 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -395,6 +395,7 @@ class DATA_PT_camera_display(CameraButtonsPanel, Panel): sub.prop(cam, "passepartout_alpha", text="") row.prop_decorator(cam, "passepartout_alpha") + class DATA_PT_camera_display_composition_guides(CameraButtonsPanel, Panel): bl_label = "Composition Guides" bl_parent_id = "DATA_PT_camera_display" diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index c4c9660c798..9f84751e835 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -1120,6 +1120,7 @@ def brush_basic_texpaint_settings(layout, context, brush, *, compact=False): header=True ) + def brush_basic__draw_color_selector(context, layout, brush, gp_settings, props): tool_settings = context.scene.tool_settings settings = tool_settings.gpencil_paint @@ -1168,6 +1169,7 @@ def brush_basic__draw_color_selector(context, layout, brush, gp_settings, props) row = layout.row(align=True) row.prop(props, "subdivision") + def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False): tool_settings = context.tool_settings settings = tool_settings.gpencil_paint diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index f1dd6a1c890..60caa39b723 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -618,7 +618,6 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel, Panel): layout.prop(part, "use_rotations", text="") layout.enabled = particle_panel_enabled(context, psys) - def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py index db33fda3b17..abc75ceed2c 100644 --- a/release/scripts/startup/bl_ui/properties_physics_common.py +++ b/release/scripts/startup/bl_ui/properties_physics_common.py @@ -363,6 +363,7 @@ def basic_force_field_falloff_ui(self, field): sub.prop(field, "distance_max", text="") row.prop_decorator(field, "distance_max") + classes = ( PHYSICS_PT_add, ) diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 82c5bd311a2..888eb40e27e 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -1397,6 +1397,7 @@ class PHYSICS_PT_viewport_display_debug(PhysicButtonsPanel, Panel): col.prop(domain, "vector_field") col.prop(domain, "vector_scale") + class PHYSICS_PT_viewport_display_advanced(PhysicButtonsPanel, Panel): bl_label = "Advanced" bl_parent_id = 'PHYSICS_PT_viewport_display' @@ -1428,6 +1429,7 @@ class PHYSICS_PT_viewport_display_advanced(PhysicButtonsPanel, Panel): else: note.label(icon='INFO', text="Range highlighting for flags is not available!") + classes = ( FLUID_PT_presets, PHYSICS_PT_fluid, diff --git a/release/scripts/startup/bl_ui/properties_view_layer.py b/release/scripts/startup/bl_ui/properties_view_layer.py index 36bbf78d8ab..afa00bb50c2 100644 --- a/release/scripts/startup/bl_ui/properties_view_layer.py +++ b/release/scripts/startup/bl_ui/properties_view_layer.py @@ -134,6 +134,7 @@ class VIEWLAYER_PT_eevee_layer_passes_effects(ViewLayerButtonsPanel, Panel): col.prop(view_layer_eevee, "use_pass_bloom", text="Bloom") col.active = scene_eevee.use_bloom + classes = ( VIEWLAYER_PT_layer, VIEWLAYER_PT_eevee_layer_passes, diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 2c52d9cd337..23734601570 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -20,7 +20,6 @@ from bpy.types import Header, Panel, Menu, UIList - class FILEBROWSER_HT_header(Header): bl_space_type = 'FILE_BROWSER' diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 744726af5d1..e6dcfa0a7ab 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1288,7 +1288,6 @@ class _defs_sculpt: draw_settings=draw_settings, ) - @ToolDef.from_fn def face_set_lasso(): def draw_settings(_context, layout, tool): diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 9a8934b8e50..576e56c929f 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1019,6 +1019,7 @@ class USERPREF_PT_theme_bone_color_sets(ThemePanel, CenterAlignMixIn, Panel): flow.prop(ui, "active") flow.prop(ui, "show_colored_constraints") + class USERPREF_PT_theme_collection_colors(ThemePanel, CenterAlignMixIn, Panel): bl_label = "Collection Colors" bl_options = {'DEFAULT_CLOSED'} @@ -1671,6 +1672,7 @@ class USERPREF_PT_ndof_settings(Panel): # ----------------------------------------------------------------------------- # Key-Map Editor Panels + class KeymapPanel: bl_space_type = 'PREFERENCES' bl_region_type = 'WINDOW' @@ -2157,6 +2159,7 @@ class ExperimentalPanel: col = split.split() col.operator("wm.url_open", text=task, icon='URL').url = self.url_prefix + task + """ # Example panel, leave it here so we always have a template to follow even # after the features are gone from the experimental panel. diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 6871ab20194..4f814802705 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3066,13 +3066,13 @@ class VIEW3D_MT_mask(Menu): props = layout.operator("sculpt.dirty_mask", text='Dirty Mask') + class VIEW3D_MT_face_sets(Menu): bl_label = "Face Sets" def draw(self, _context): layout = self.layout - op = layout.operator("sculpt.face_sets_create", text='Face Set From Masked') op.mode = 'MASKED' @@ -3248,6 +3248,7 @@ class VIEW3D_MT_particle_context_menu(Menu): layout.operator("particle.select_linked", text="Select Linked") + class VIEW3D_MT_particle_showhide(ShowHideMenu, Menu): _operator_name = "particle" @@ -5283,6 +5284,7 @@ class VIEW3D_MT_sculpt_mask_edit_pie(Menu): op.filter_type = 'CONTRAST_DECREASE' op.auto_iteration_count = False + class VIEW3D_MT_sculpt_face_sets_edit_pie(Menu): bl_label = "Face Sets Edit" @@ -5303,6 +5305,7 @@ class VIEW3D_MT_sculpt_face_sets_edit_pie(Menu): op = pie.operator("sculpt.face_set_change_visibility", text='Show All') op.mode = 'SHOW_ALL' + class VIEW3D_MT_wpaint_vgroup_lock_pie(Menu): bl_label = "Vertex Group Locks" diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 5d51c3a71a4..5f668bbc881 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -397,7 +397,6 @@ class VIEW3D_PT_tools_brush_settings_advanced(Panel, View3DPaintBrushPanel): bl_options = {'DEFAULT_CLOSED'} bl_ui_units_x = 14 - def draw(self, context): layout = self.layout @@ -825,7 +824,6 @@ class VIEW3D_PT_sculpt_voxel_remesh(Panel, View3DPaintPanel): if context.preferences.experimental.use_sculpt_vertex_colors: col.prop(mesh, "use_remesh_preserve_vertex_colors", text="Vertex Colors") - layout.operator("object.voxel_remesh", text="Remesh") @@ -966,7 +964,6 @@ class VIEW3D_PT_tools_weightpaint_symmetry(Panel, View3DPaintPanel): row.prop(context.object.data, 'use_mirror_vertex_group_x') - class VIEW3D_PT_tools_weightpaint_symmetry_for_topbar(Panel): bl_space_type = 'TOPBAR' bl_region_type = 'HEADER' @@ -1237,7 +1234,7 @@ class VIEW3D_PT_tools_particlemode_options(View3DPanel, Panel): col.active = pe.is_editable col.prop(ob.data, "use_mirror_x") if pe.tool == 'ADD': - col.prop(ob.data, "use_mirror_topology") + col.prop(ob.data, "use_mirror_topology") col.separator() col.prop(pe, "use_preserve_length", text="Preserve Strand Lengths") col.prop(pe, "use_preserve_root", text="Preserve Root Positions") diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 0cf0a99c326..027f4068dc4 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -475,12 +475,14 @@ texture_node_categories = [ ]), ] + def not_implemented_node(idname): NodeType = getattr(bpy.types, idname) name = NodeType.bl_rna.name label = "%s (mockup)" % name return NodeItem(idname, label=label) + simulation_node_categories = [ # Simulation Nodes SimulationNodeCategory("SIM_OUTPUT", "Output", items=[ |