From f1520a9a78d9e83cb9c05022f330880e5315cb4a Mon Sep 17 00:00:00 2001 From: Campbell Barton <ideasman42@gmail.com> Date: Thu, 29 Sep 2022 11:09:22 +1000 Subject: [PATCH] Cleanup: autopep8 format pie menus --- space_view3d_pie_menus/__init__.py | 5 +- space_view3d_pie_menus/pie_align_menu.py | 83 +++++++++---------- space_view3d_pie_menus/pie_animation_menu.py | 10 +-- .../pie_apply_transform_menu.py | 10 +-- space_view3d_pie_menus/pie_defaults_menu.py | 11 ++- space_view3d_pie_menus/pie_delete_menu.py | 4 +- .../pie_editor_switch_menu.py | 44 ++++++---- .../pie_manipulator_menu.py | 5 +- space_view3d_pie_menus/pie_modes_menu.py | 20 +++-- space_view3d_pie_menus/pie_origin.py | 41 ++++----- .../pie_proportional_menu.py | 13 +-- space_view3d_pie_menus/pie_save_open_menu.py | 10 +-- space_view3d_pie_menus/pie_sculpt_menu.py | 32 +++---- space_view3d_pie_menus/pie_select_menu.py | 13 ++- space_view3d_pie_menus/pie_shading_menu.py | 4 +- .../pie_views_numpad_menu.py | 16 ++-- 16 files changed, 171 insertions(+), 150 deletions(-) diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py index cb539e31b..34b47cac7 100644 --- a/space_view3d_pie_menus/__init__.py +++ b/space_view3d_pie_menus/__init__.py @@ -23,7 +23,7 @@ bl_info = { "warning": "", "doc_url": "{BLENDER_MANUAL_URL}/addons/interface/viewport_pies.html", "category": "Interface" - } +} sub_modules_names = ( "pie_modes_menu", @@ -41,7 +41,7 @@ sub_modules_names = ( "pie_editor_switch_menu", "pie_defaults_menu", "pie_proportional_menu", - ) +) sub_modules = [__import__(__package__ + "." + submod, {}, {}, submod) for submod in sub_modules_names] @@ -77,6 +77,7 @@ def get_addon_preferences(name=''): else: return addon_prefs + def create_property(cls, name, prop): if not hasattr(cls, '__annotations__'): cls.__annotations__ = dict() diff --git a/space_view3d_pie_menus/pie_align_menu.py b/space_view3d_pie_menus/pie_align_menu.py index 4ba1553e9..55b3421ba 100644 --- a/space_view3d_pie_menus/pie_align_menu.py +++ b/space_view3d_pie_menus/pie_align_menu.py @@ -10,13 +10,13 @@ bl_info = { "warning": "", "doc_url": "", "category": "Edit Align Pie" - } +} import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) from bpy.props import EnumProperty @@ -71,14 +71,11 @@ class PIE_MT_Align(Menu): # 2 - BOTTOM pie.operator("align.2xyz", text="Align To Y-0").axis = '1' # 8 - TOP - pie.operator("align.selected2xyz", - text="Align Y").axis = 'Y' + pie.operator("align.selected2xyz", text="Align Y").axis = 'Y' # 7 - TOP - LEFT - pie.operator("align.selected2xyz", - text="Align X").axis = 'X' + pie.operator("align.selected2xyz", text="Align X").axis = 'X' # 9 - TOP - RIGHT - pie.operator("align.selected2xyz", - text="Align Z").axis = 'Z' + pie.operator("align.selected2xyz", text="Align Z").axis = 'Z' # 1 - BOTTOM - LEFT pie.operator("align.2xyz", text="Align To X-0").axis = '0' # 3 - BOTTOM - RIGHT @@ -94,14 +91,14 @@ class PIE_OT_AlignSelectedXYZ(Operator): axis: EnumProperty( name="Axis", - items=[ + items=( ('X', "X", "X Axis"), ('Y', "Y", "Y Axis"), - ('Z', "Z", "Z Axis") - ], + ('Z', "Z", "Z Axis"), + ), description="Choose an axis for alignment", default='X' - ) + ) @classmethod def poll(cls, context): @@ -112,8 +109,8 @@ class PIE_OT_AlignSelectedXYZ(Operator): values = { 'X': [(0, 1, 1), (True, False, False)], 'Y': [(1, 0, 1), (False, True, False)], - 'Z': [(1, 1, 0), (False, False, True)] - } + 'Z': [(1, 1, 0), (False, False, True)], + } chosen_value = values[self.axis][0] constraint_value = values[self.axis][1] bpy.ops.transform.resize( @@ -137,15 +134,15 @@ class PIE_OT_AlignToXYZ0(Operator): bl_options = {'REGISTER', 'UNDO'} axis: EnumProperty( - name="Axis", - items=[ - ('0', "X", "X Axis"), - ('1', "Y", "Y Axis"), - ('2', "Z", "Z Axis") - ], - description="Choose an axis for alignment", - default='0' - ) + name="Axis", + items=( + ('0', "X", "X Axis"), + ('1', "Y", "Y Axis"), + ('2', "Z", "Z Axis"), + ), + description="Choose an axis for alignment", + default='0' + ) @classmethod def poll(cls, context): @@ -171,24 +168,24 @@ class PIE_OT_AlignXYZAll(Operator): bl_options = {'REGISTER', 'UNDO'} axis: EnumProperty( - name="Axis", - items=[ - ('0', "X", "X Axis"), - ('1', "Y", "Y Axis"), - ('2', "Z", "Z Axis") - ], - description="Choose an axis for alignment", - default='0' - ) + name="Axis", + items=( + ('0', "X", "X Axis"), + ('1', "Y", "Y Axis"), + ('2', "Z", "Z Axis"), + ), + description="Choose an axis for alignment", + default='0' + ) side: EnumProperty( - name="Side", - items=[ - ('POSITIVE', "Front", "Align on the positive chosen axis"), - ('NEGATIVE', "Back", "Align acriss the negative chosen axis"), - ], - description="Choose a side for alignment", - default='POSITIVE' - ) + name="Side", + items=[ + ('POSITIVE', "Front", "Align on the positive chosen axis"), + ('NEGATIVE', "Back", "Align acriss the negative chosen axis"), + ], + description="Choose a side for alignment", + default='POSITIVE' + ) @classmethod def poll(cls, context): @@ -229,7 +226,7 @@ classes = ( PIE_OT_AlignSelectedXYZ, PIE_OT_AlignToXYZ0, PIE_OT_AlignXYZAll, - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_animation_menu.py b/space_view3d_pie_menus/pie_animation_menu.py index 1b0086889..3d585ec15 100644 --- a/space_view3d_pie_menus/pie_animation_menu.py +++ b/space_view3d_pie_menus/pie_animation_menu.py @@ -10,13 +10,13 @@ bl_info = { "warning": "", "doc_url": "", "category": "Animation Pie" - } +} import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) # Pie Animation @@ -71,7 +71,7 @@ class PIE_OT_InsertAutoKeyframe(Operator): classes = ( PIE_MT_PieAnimation, PIE_OT_InsertAutoKeyframe - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_apply_transform_menu.py b/space_view3d_pie_menus/pie_apply_transform_menu.py index fde3176b1..68371aa56 100644 --- a/space_view3d_pie_menus/pie_apply_transform_menu.py +++ b/space_view3d_pie_menus/pie_apply_transform_menu.py @@ -10,13 +10,13 @@ bl_info = { "warning": "", "doc_url": "", "category": "Apply Transform Pie" - } +} import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) from bpy.props import EnumProperty @@ -83,7 +83,7 @@ classes = ( PIE_MT_PieApplyTransforms, PIE_MT_ClearMenu, PIE_OT_ClearAll, - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_defaults_menu.py b/space_view3d_pie_menus/pie_defaults_menu.py index a556efc1f..44bbe3635 100644 --- a/space_view3d_pie_menus/pie_defaults_menu.py +++ b/space_view3d_pie_menus/pie_defaults_menu.py @@ -8,13 +8,13 @@ bl_info = { "warning": "", "doc_url": "", "category": "Interface" - } +} import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) import os @@ -45,10 +45,9 @@ class PIE_MT_Load_Defaults(Menu): pie.separator() - classes = ( PIE_MT_Load_Defaults, - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_delete_menu.py b/space_view3d_pie_menus/pie_delete_menu.py index a59a4b0c9..000d30515 100644 --- a/space_view3d_pie_menus/pie_delete_menu.py +++ b/space_view3d_pie_menus/pie_delete_menu.py @@ -10,7 +10,7 @@ bl_info = { "warning": "", "doc_url": "", "category": "Edit Delete Pie" - } +} import bpy from bpy.types import Menu @@ -50,7 +50,7 @@ class PIE_MT_PieDelete(Menu): classes = ( PIE_MT_PieDelete, - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_editor_switch_menu.py b/space_view3d_pie_menus/pie_editor_switch_menu.py index 747b7dbc3..5af85a7b5 100644 --- a/space_view3d_pie_menus/pie_editor_switch_menu.py +++ b/space_view3d_pie_menus/pie_editor_switch_menu.py @@ -10,18 +10,20 @@ bl_info = { "warning": "", "doc_url": "", "category": "Editor Switch Pie" - } +} import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) from bpy.props import ( - StringProperty, - ) + StringProperty, +) # Pie Menu + + class PIE_MT_AreaPieEditor(Menu): bl_idname = "PIE_MT_editor" bl_label = "Editor Switch" @@ -31,7 +33,7 @@ class PIE_MT_AreaPieEditor(Menu): pie = layout.menu_pie() # 4 - LEFT pie.operator(PIE_OT_SetAreaType.bl_idname, - text="Video Sequence Editor", icon="SEQUENCE").types = "SEQUENCE_EDITOR" + text="Video Sequence Editor", icon="SEQUENCE").types = "SEQUENCE_EDITOR" # 6 - RIGHT pie.menu(PIE_MT_AreaTypePieNode.bl_idname, text="Node Editors", icon="NODETREE") # 2 - BOTTOM @@ -44,11 +46,13 @@ class PIE_MT_AreaPieEditor(Menu): pie.operator(PIE_OT_SetAreaType.bl_idname, text="UV Editor", icon="UV").types = "UV" # 1 - BOTTOM - LEFT pie.operator(PIE_OT_SetAreaType.bl_idname, - text="Movie Clip Editor", icon="TRACKER").types = "CLIP_EDITOR" + text="Movie Clip Editor", icon="TRACKER").types = "CLIP_EDITOR" # 3 - BOTTOM - RIGHT pie.menu(PIE_MT_AreaTypePieAnim.bl_idname, text="Animation Editors", icon="ACTION") # Sub Menu Script/Data Editors + + class PIE_MT_AreaTypePieOther(Menu): bl_idname = "TOPBAR_MT_window_pie_area_type_other" bl_label = "Editor Type (other)" @@ -57,14 +61,18 @@ class PIE_MT_AreaTypePieOther(Menu): def draw(self, context): self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Outliner", icon="OUTLINER").types = "OUTLINER" self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Properties", icon="PROPERTIES").types = "PROPERTIES" - self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="File Browser", icon="FILEBROWSER").types = "FILE_BROWSER" + self.layout.operator( + PIE_OT_SetAreaType.bl_idname, + text="File Browser", + icon="FILEBROWSER").types = "FILE_BROWSER" self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Preferences", icon="PREFERENCES").types = "PREFERENCES" self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Text Editor", icon="TEXT").types = "TEXT_EDITOR" self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Python Console", icon="CONSOLE").types = "CONSOLE" self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Info", icon="INFO").types = "INFO" -# Sub Menu Node editors + +# Sub Menu Node editors. class PIE_MT_AreaTypePieNode(Menu): bl_idname = "TOPBAR_MT_window_pie_area_type_node" bl_label = "Editor Type (Node)" @@ -72,10 +80,13 @@ class PIE_MT_AreaTypePieNode(Menu): def draw(self, context): self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Shader", icon="NODE_MATERIAL").types = "ShaderNodeTree" - self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Compositor", icon="NODE_COMPOSITING").types = "CompositorNodeTree" - self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Texture", icon="NODE_TEXTURE").types = "TextureNodeTree" + self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Compositor", + icon="NODE_COMPOSITING").types = "CompositorNodeTree" + self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Texture", + icon="NODE_TEXTURE").types = "TextureNodeTree" -# Sub Menu animation Editors + +# Sub Menu animation Editors. class PIE_MT_AreaTypePieAnim(Menu): bl_idname = "TOPBAR_MT_window_pie_area_type_anim" bl_label = "Editor Type (Animation)" @@ -88,7 +99,8 @@ class PIE_MT_AreaTypePieAnim(Menu): self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="Drivers", icon="DRIVER").types = "DRIVERS" self.layout.operator(PIE_OT_SetAreaType.bl_idname, text="NLA Editor", icon="NLA").types = "NLA_EDITOR" -# Operators + +# Operators. class PIE_OT_SetAreaType(Operator): bl_idname = "wm.set_area_type" bl_label = "Change Editor Type" @@ -101,6 +113,7 @@ class PIE_OT_SetAreaType(Operator): context.area.ui_type = self.types return {'FINISHED'} + class PIE_OT_Timeline(Operator): bl_idname = "wm.set_timeline" bl_label = "Change Editor Type" @@ -111,6 +124,7 @@ class PIE_OT_Timeline(Operator): bpy.context.area.ui_type = 'TIMELINE' return {'FINISHED'} + classes = ( PIE_MT_AreaPieEditor, PIE_MT_AreaTypePieOther, @@ -118,7 +132,7 @@ classes = ( PIE_MT_AreaTypePieAnim, PIE_OT_Timeline, PIE_MT_AreaTypePieNode - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_manipulator_menu.py b/space_view3d_pie_menus/pie_manipulator_menu.py index 4b17e3d51..98e28b85d 100644 --- a/space_view3d_pie_menus/pie_manipulator_menu.py +++ b/space_view3d_pie_menus/pie_manipulator_menu.py @@ -10,7 +10,7 @@ bl_info = { "warning": "", "doc_url": "", "category": "Manipulator Pie" - } +} import bpy from bpy.types import ( @@ -84,11 +84,10 @@ class PIE_MT_Manipulator(Menu): pie.operator("w.manipulators", text="Translate", icon='NONE').type = 'TRANSLATE' - classes = ( PIE_OT_WManupulators, PIE_MT_Manipulator, - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_modes_menu.py b/space_view3d_pie_menus/pie_modes_menu.py index 73be5d88c..c5a3742bf 100644 --- a/space_view3d_pie_menus/pie_modes_menu.py +++ b/space_view3d_pie_menus/pie_modes_menu.py @@ -213,9 +213,11 @@ class PIE_MT_ObjectEditMode(Menu): box = pie.box() box.label(text=message, icon="INFO") - elif ob and ob.type == 'MESH' and ob.mode in {'OBJECT', 'SCULPT', 'VERTEX_PAINT', - 'WEIGHT_PAINT', 'TEXTURE_PAINT', - 'PARTICLE_EDIT', 'GPENCIL_EDIT'}: + elif ob and ob.type == 'MESH' and ob.mode in { + 'OBJECT', 'SCULPT', 'VERTEX_PAINT', + 'WEIGHT_PAINT', 'TEXTURE_PAINT', + 'PARTICLE_EDIT', 'GPENCIL_EDIT', + }: pie = layout.menu_pie() # 4 - LEFT pie.operator("class.pieweightpaint", text="Weight Paint", icon='WPAINT_HLT') @@ -346,7 +348,8 @@ class PIE_MT_ObjectEditMode(Menu): if ob and ob.type == 'GPENCIL': pie = layout.menu_pie() # 4 - LEFT - pie.operator(PIE_OT_SetObjectModePie.bl_idname, text="Sculpt", icon="SCULPTMODE_HLT").mode = "SCULPT_GPENCIL" + pie.operator(PIE_OT_SetObjectModePie.bl_idname, text="Sculpt", + icon="SCULPTMODE_HLT").mode = "SCULPT_GPENCIL" # 6 - RIGHT pie.operator(PIE_OT_SetObjectModePie.bl_idname, text="Draw", icon="GREASEPENCIL").mode = "PAINT_GPENCIL" # 2 - BOTTOM @@ -360,9 +363,10 @@ class PIE_MT_ObjectEditMode(Menu): # 1 - BOTTOM - LEFT pie.separator() # 3 - BOTTOM - RIGHT - pie.operator(PIE_OT_SetObjectModePie.bl_idname, text="Weight Paint", icon="WPAINT_HLT").mode = "WEIGHT_GPENCIL" - - + pie.operator( + PIE_OT_SetObjectModePie.bl_idname, + text="Weight Paint", + icon="WPAINT_HLT").mode = "WEIGHT_GPENCIL" elif ob and ob.type in {"LIGHT", "CAMERA", "EMPTY", "SPEAKER"}: message = "Active Object has only Object Mode available" @@ -387,7 +391,7 @@ classes = ( PIE_OT_ClassParticleEdit, PIE_OT_VertsEdgesFaces, PIE_OT_SetObjectModePie, - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_origin.py b/space_view3d_pie_menus/pie_origin.py index 06fa5c842..5605b229a 100644 --- a/space_view3d_pie_menus/pie_origin.py +++ b/space_view3d_pie_menus/pie_origin.py @@ -10,13 +10,13 @@ bl_info = { "warning": "", "doc_url": "", "category": "Origin Pie" - } +} import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) # Pivot to selection @@ -40,6 +40,8 @@ class PIE_OT_PivotToSelection(Operator): return {'FINISHED'} # Pivot to Bottom + + class PIE_OT_PivotBottom(Operator): bl_idname = "object.pivotobottom" bl_label = "Pivot To Bottom" @@ -234,20 +236,19 @@ class PIE_MT_OriginPivot(Menu): icon='NONE').type = 'ORIGIN_CENTER_OF_MASS' # 6 - RIGHT pie.operator("object.origin_set", text="Origin to Cursor", - icon='PIVOT_CURSOR').type = 'ORIGIN_CURSOR' + icon='PIVOT_CURSOR').type = 'ORIGIN_CURSOR' # 2 - BOTTOM pie.operator("object.pivotobottom", text="Origin to Bottom", - icon='TRIA_DOWN') + icon='TRIA_DOWN') # 8 - TOP pie.operator("object.pivot2selection", text="Origin To Selection", - icon='SNAP_INCREMENT') + icon='SNAP_INCREMENT') # 7 - TOP - LEFT pie.operator("object.origin_set", text="Geometry To Origin", - icon='NONE').type = 'GEOMETRY_ORIGIN' + icon='NONE').type = 'GEOMETRY_ORIGIN' # 9 - TOP - RIGHT pie.operator("object.origin_set", text="Origin To Geometry", - icon='NONE').type = 'ORIGIN_GEOMETRY' - + icon='NONE').type = 'ORIGIN_GEOMETRY' elif obj and obj.type == 'MESH' and obj.mode in {'EDIT'}: # 4 - LEFT @@ -255,19 +256,19 @@ class PIE_MT_OriginPivot(Menu): icon='NONE') # 6 - RIGHT pie.operator("object.pivot2cursor_edit", text="Origin to Cursor", - icon='PIVOT_CURSOR') + icon='PIVOT_CURSOR') # 2 - BOTTOM pie.operator("object.pivotobottom_edit", text="Origin to Bottom", - icon='TRIA_DOWN') + icon='TRIA_DOWN') # 8 - TOP pie.operator("object.setorigintoselected_edit", text="Origin To Selected", - icon='SNAP_INCREMENT') + icon='SNAP_INCREMENT') # 7 - TOP - LEFT pie.operator("object.geometrytoorigin_edit", text="Geometry To Origin", - icon='NONE') + icon='NONE') # 9 - TOP - RIGHT pie.operator("object.origintogeometry_edit", text="Origin To Geometry", - icon='NONE') + icon='NONE') else: # 4 - LEFT @@ -275,16 +276,16 @@ class PIE_MT_OriginPivot(Menu): icon='NONE').type = 'ORIGIN_CENTER_OF_MASS' # 6 - RIGHT pie.operator("object.origin_set", text="Origin To 3D Cursor", - icon='PIVOT_CURSOR').type = 'ORIGIN_CURSOR' + icon='PIVOT_CURSOR').type = 'ORIGIN_CURSOR' # 2 - BOTTOM pie.operator("object.pivot2selection", text="Origin To Selection", - icon='SNAP_INCREMENT') + icon='SNAP_INCREMENT') # 8 - TOP pie.operator("object.origin_set", text="Origin To Geometry", - icon='NONE').type = 'ORIGIN_GEOMETRY' + icon='NONE').type = 'ORIGIN_GEOMETRY' # 7 - TOP - LEFT pie.operator("object.origin_set", text="Geometry To Origin", - icon='NONE').type = 'GEOMETRY_ORIGIN' + icon='NONE').type = 'GEOMETRY_ORIGIN' classes = ( @@ -297,7 +298,7 @@ classes = ( PIE_OT_OriginToGeometry_edit, PIE_OT_GeometryToOrigin_edit, PIE_OT_SetOriginToSelected_edit - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_proportional_menu.py b/space_view3d_pie_menus/pie_proportional_menu.py index 913b42093..d963786ca 100644 --- a/space_view3d_pie_menus/pie_proportional_menu.py +++ b/space_view3d_pie_menus/pie_proportional_menu.py @@ -10,13 +10,13 @@ bl_info = { "warning": "", "doc_url": "", "category": "Proportional Edit Pie" - } +} import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) # Proportional Edit Object @@ -148,6 +148,7 @@ class PIE_OT_ProportionalRandomObj(Operator): ts.proportional_edit_falloff = 'RANDOM' return {'FINISHED'} + class PIE_OT_ProportionalInverseSquareObj(Operator): bl_idname = "proportional_obj.inversesquare" bl_label = "Proportional Random Object" @@ -281,6 +282,7 @@ class PIE_OT_ProportionalRandomEdt(Operator): ts.proportional_edit_falloff = 'RANDOM' return {'FINISHED'} + class PIE_OT_ProportionalInverseSquareEdt(Operator): bl_idname = "proportional_edt.inversesquare" bl_label = "Proportional Inverese Square EditMode" @@ -373,7 +375,6 @@ class PIE_MT_proportionalmoreob(Menu): box.operator("proportional_obj.random", text="Random", icon='RNDCURVE') - classes = ( PIE_OT_ProportionalEditObj, PIE_OT_ProportionalSmoothObj, @@ -399,7 +400,7 @@ classes = ( PIE_MT_ProportionalEdt, PIE_MT_ProportionalMore, PIE_MT_proportionalmoreob - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_save_open_menu.py b/space_view3d_pie_menus/pie_save_open_menu.py index 33bce13c3..042caaf9b 100644 --- a/space_view3d_pie_menus/pie_save_open_menu.py +++ b/space_view3d_pie_menus/pie_save_open_menu.py @@ -8,13 +8,13 @@ bl_info = { "warning": "", "doc_url": "", "category": "Save Open Pie" - } +} import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) import os @@ -136,7 +136,7 @@ classes = ( PIE_MT_recover, PIE_MT_link, PIE_MT_openio, - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_sculpt_menu.py b/space_view3d_pie_menus/pie_sculpt_menu.py index ad4f0f142..964530ddd 100644 --- a/space_view3d_pie_menus/pie_sculpt_menu.py +++ b/space_view3d_pie_menus/pie_sculpt_menu.py @@ -10,14 +10,14 @@ bl_info = { "warning": "", "doc_url": "", "category": "Sculpt Pie" - } +} import os import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) # Sculpt Draw @@ -43,27 +43,27 @@ class PIE_MT_SculptPie(Menu): pie.scale_y = 1.2 # 4 - LEFT pie.operator("paint.brush_select", - text=" Crease", icon_value=brush_icons["crease"]).sculpt_tool = 'CREASE' + text=" Crease", icon_value=brush_icons["crease"]).sculpt_tool = 'CREASE' # 6 - RIGHT pie.operator("paint.brush_select", - text=" Blob", icon_value=brush_icons["blob"]).sculpt_tool = 'BLOB' + text=" Blob", icon_value=brush_icons["blob"]).sculpt_tool = 'BLOB' # 2 - BOTTOM pie.menu(PIE_MT_Sculpttwo.bl_idname, text="More Brushes") # 8 - TOP pie.operator("sculpt.sculptraw", - text=" Draw", icon_value=brush_icons["draw"]) + text=" Draw", icon_value=brush_icons["draw"]) # 7 - TOP - LEFT pie.operator("paint.brush_select", - text=" Clay", icon_value=brush_icons["clay"]).sculpt_tool = 'CLAY' + text=" Clay", icon_value=brush_icons["clay"]).sculpt_tool = 'CLAY' # 9 - TOP - RIGHT pie.operator("paint.brush_select", - text=" Clay Strips", icon_value=brush_icons["clay_strips"]).sculpt_tool = 'CLAY_STRIPS' + text=" Clay Strips", icon_value=brush_icons["clay_strips"]).sculpt_tool = 'CLAY_STRIPS' # 1 - BOTTOM - LEFT pie.operator("paint.brush_select", - text=" Inflate/Deflate", icon_value=brush_icons["inflate"]).sculpt_tool = 'INFLATE' + text=" Inflate/Deflate", icon_value=brush_icons["inflate"]).sculpt_tool = 'INFLATE' # 3 - BOTTOM - RIGHT pie.menu(PIE_MT_Sculptthree.bl_idname, - text=" Grab Brushes", icon_value=brush_icons["grab"]) + text=" Grab Brushes", icon_value=brush_icons["grab"]) # Pie Sculpt 2 @@ -116,12 +116,15 @@ class PIE_MT_Sculptthree(Menu): brush_icons = {} + def create_icons(): global brush_icons icons_directory = bpy.utils.system_resource('DATAFILES', path="icons") - brushes = ["crease", "blob", "smooth", "draw", "clay", "clay_strips", "inflate", "grab", + brushes = ( + "crease", "blob", "smooth", "draw", "clay", "clay_strips", "inflate", "grab", "nudge", "thumb", "snake_hook", "rotate", "flatten", "scrape", "fill", "pinch", - "layer", "mask"] + "layer", "mask", + ) for brush in brushes: filename = os.path.join(icons_directory, f"brush.sculpt.{brush}.dat") icon_value = bpy.app.icons.new_triangles_from_file(filename) @@ -133,12 +136,13 @@ def release_icons(): for value in brush_icons.values(): bpy.app.icons.release(value) + classes = ( PIE_MT_SculptPie, PIE_MT_Sculpttwo, PIE_MT_Sculptthree, PIE_OT_SculptSculptDraw, - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_select_menu.py b/space_view3d_pie_menus/pie_select_menu.py index 9730d7fc0..cf596053e 100644 --- a/space_view3d_pie_menus/pie_select_menu.py +++ b/space_view3d_pie_menus/pie_select_menu.py @@ -10,7 +10,7 @@ bl_info = { "warning": "", "doc_url": "", "category": "Select Pie" - } +} import bpy from bpy.types import ( @@ -19,7 +19,6 @@ from bpy.types import ( ) - # Pie Selection Object Mode - A class PIE_MT_SelectionsMore(Menu): bl_idname = "PIE_MT_selectionsmore" @@ -55,6 +54,8 @@ class PIE_MT_SelectionsMore(Menu): props.direction = 'CHILD' # Pie Selection Object Mode - A + + class PIE_MT_SelectionsOM(Menu): bl_idname = "PIE_MT_selectionsom" bl_label = "Pie Selections Object Mode" @@ -67,11 +68,9 @@ class PIE_MT_SelectionsOM(Menu): # 6 - RIGHT pie.operator("object.select_by_type", text="Select By Type") # 2 - BOTTOM - pie.operator("object.select_all", text="Invert Selection", - icon='ZOOM_PREVIOUS').action = 'INVERT' + pie.operator("object.select_all", text="Invert Selection", icon='ZOOM_PREVIOUS').action = 'INVERT' # 8 - TOP - pie.operator("object.select_all", text="Select All Toggle", - icon='NONE').action = 'TOGGLE' + pie.operator("object.select_all", text="Select All Toggle", icon='NONE').action = 'TOGGLE' # 7 - TOP - LEFT pie.operator("view3d.select_circle", text="Circle Select") # 9 - TOP - RIGHT @@ -214,7 +213,7 @@ classes = ( PIE_OT_classedgeop, PIE_OT_classfaceop, PIE_OT_vertsedgesfacesop - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_shading_menu.py b/space_view3d_pie_menus/pie_shading_menu.py index 49be9dba4..9ab8d6175 100644 --- a/space_view3d_pie_menus/pie_shading_menu.py +++ b/space_view3d_pie_menus/pie_shading_menu.py @@ -10,7 +10,7 @@ bl_info = { "warning": "", "doc_url": "", "category": "Shading Pie" - } +} import bpy from bpy.types import Menu @@ -38,7 +38,7 @@ class PIE_MT_ShadingView(Menu): classes = ( PIE_MT_ShadingView, - ) +) addon_keymaps = [] diff --git a/space_view3d_pie_menus/pie_views_numpad_menu.py b/space_view3d_pie_menus/pie_views_numpad_menu.py index feaee9859..dc75d491c 100644 --- a/space_view3d_pie_menus/pie_views_numpad_menu.py +++ b/space_view3d_pie_menus/pie_views_numpad_menu.py @@ -10,21 +10,23 @@ bl_info = { "warning": "", "doc_url": "", "category": "View Numpad Pie" - } +} import bpy from bpy.types import ( - Menu, - Operator, - ) + Menu, + Operator, +) # Lock Camera Transforms class PIE_OT_LockTransforms(Operator): bl_idname = "object.locktransforms" bl_label = "Lock Object Transforms" - bl_description = ("Enable or disable the editing of objects transforms in the 3D View\n" - "Needs an existing Active Object") + bl_description = ( + "Enable or disable the editing of objects transforms in the 3D View\n" + "Needs an existing Active Object" + ) bl_options = {'REGISTER', 'UNDO'} @classmethod @@ -118,7 +120,7 @@ class PIE_MT_ViewNumpad(Menu): classes = ( PIE_MT_ViewNumpad, PIE_OT_LockTransforms, - ) +) addon_keymaps = [] -- GitLab