From baaf58872bf83049637f2e4da9c444265846f2af Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Sun, 4 Nov 2018 18:44:53 +0100 Subject: port "3D Viewport Pie Menus" to Blender 2.8 I'm pretty sure that I did not find every thing that needs to be ported. At least the addon is usable again. I replaced deprecated icons with NONE. Someone else, who is responsible for this addon, can choose some new icons. Differential Revision: https://developer.blender.org/D3883 Reviewer: campbellbarton --- sequencer_kinoraw_tools/ui.py | 2 +- space_view3d_pie_menus/__init__.py | 45 +++++++++++----------- space_view3d_pie_menus/pie_align_menu.py | 8 ++-- space_view3d_pie_menus/pie_animation_menu.py | 2 +- space_view3d_pie_menus/pie_apply_transform_menu.py | 18 ++++----- space_view3d_pie_menus/pie_cursor.py | 10 ++--- space_view3d_pie_menus/pie_delete_menu.py | 8 ++-- space_view3d_pie_menus/pie_editor_switch_menu.py | 8 ++-- space_view3d_pie_menus/pie_manipulator_menu.py | 10 ++--- space_view3d_pie_menus/pie_modes_menu.py | 4 +- space_view3d_pie_menus/pie_orientation_menu.py | 2 +- space_view3d_pie_menus/pie_origin.py | 18 ++++----- space_view3d_pie_menus/pie_pivot_point_menu.py | 2 +- space_view3d_pie_menus/pie_proportional_menu.py | 2 +- space_view3d_pie_menus/pie_save_open_menu.py | 10 ++--- space_view3d_pie_menus/pie_sculpt_menu.py | 4 +- space_view3d_pie_menus/pie_select_menu.py | 16 ++++---- space_view3d_pie_menus/pie_shading_menu.py | 4 +- space_view3d_pie_menus/pie_snap_menu.py | 4 +- space_view3d_pie_menus/pie_views_numpad_menu.py | 20 +++++----- 20 files changed, 98 insertions(+), 99 deletions(-) diff --git a/sequencer_kinoraw_tools/ui.py b/sequencer_kinoraw_tools/ui.py index 9e7f2762..221f4f47 100644 --- a/sequencer_kinoraw_tools/ui.py +++ b/sequencer_kinoraw_tools/ui.py @@ -321,7 +321,7 @@ class JumptoCut(Panel): if prefs.kr_mini_ui: row = layout.row(align=True) row.operator("sequencerextra.extrasnap", text="", icon="SNAP_ON").align = 0 - row.operator("sequencerextra.extrasnap", text="", icon="SNAP_SURFACE").align = 1 + row.operator("sequencerextra.extrasnap", text="", icon="NONE").align = 1 row.operator("sequencerextra.extrasnap", text="", icon="SNAP_ON").align = 2 row.separator() diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py index e725995f..26ac9958 100644 --- a/space_view3d_pie_menus/__init__.py +++ b/space_view3d_pie_menus/__init__.py @@ -162,6 +162,28 @@ class PieToolsPreferences(AddonPreferences): update=disable_all_modules ) + for mod in sub_modules: + mod_name = mod.__name__.split('.')[-1] + + def gen_update(mod, use_prop_name): + def update(self, context): + if getattr(self, use_prop_name): + if not mod.__addon_enabled__: + register_submodule(mod) + else: + if mod.__addon_enabled__: + unregister_submodule(mod) + return update + + use_prop_name = 'use_' + mod_name + __annotations__[use_prop_name] = BoolProperty( + name=mod.bl_info['name'], + description=mod.bl_info.get('description', ''), + update=gen_update(mod, use_prop_name), + ) + + __annotations__['show_expanded_' + mod_name] = BoolProperty() + def draw(self, context): layout = self.layout split = layout.split(factor=0.5, align=True) @@ -259,29 +281,6 @@ class PieToolsPreferences(AddonPreferences): icon="FILE_PARENT") -for mod in sub_modules: - info = mod.bl_info - mod_name = mod.__name__.split('.')[-1] - - def gen_update(mod): - def update(self, context): - if getattr(self, 'use_' + mod.__name__.split('.')[-1]): - if not mod.__addon_enabled__: - register_submodule(mod) - else: - if mod.__addon_enabled__: - unregister_submodule(mod) - return update - - prop = BoolProperty( - name=info['name'], - description=info.get('description', ''), - update=gen_update(mod), - ) - setattr(PieToolsPreferences, 'use_' + mod_name, prop) - prop = BoolProperty() - setattr(PieToolsPreferences, 'show_expanded_' + mod_name, prop) - classes = ( PieToolsPreferences, ) diff --git a/space_view3d_pie_menus/pie_align_menu.py b/space_view3d_pie_menus/pie_align_menu.py index 39315137..c59a7c97 100644 --- a/space_view3d_pie_menus/pie_align_menu.py +++ b/space_view3d_pie_menus/pie_align_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "V/E/F Align tools", "author": "pitiwazou, meta-androcto", "version": (0, 1, 2), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "Mesh Edit Mode", "warning": "", "wiki_url": "", @@ -68,7 +68,7 @@ class PieAlign(Menu): box = pie.split().box().column() row = box.row(align=True) - row.label("X") + row.label(text="X") align_1 = row.operator("alignxyz.all", text="Neg") align_1.axis = '0' align_1.side = 'NEGATIVE' @@ -77,7 +77,7 @@ class PieAlign(Menu): align_2.side = 'POSITIVE' row = box.row(align=True) - row.label("Y") + row.label(text="Y") align_3 = row.operator("alignxyz.all", text="Neg") align_3.axis = '1' align_3.side = 'NEGATIVE' @@ -86,7 +86,7 @@ class PieAlign(Menu): align_4.side = 'POSITIVE' row = box.row(align=True) - row.label("Z") + row.label(text="Z") align_5 = row.operator("alignxyz.all", text="Neg") align_5.axis = '2' align_5.side = 'NEGATIVE' diff --git a/space_view3d_pie_menus/pie_animation_menu.py b/space_view3d_pie_menus/pie_animation_menu.py index d65891f9..774aa8e0 100644 --- a/space_view3d_pie_menus/pie_animation_menu.py +++ b/space_view3d_pie_menus/pie_animation_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Pie menu for Timeline controls", "author": "pitiwazou, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View", "warning": "", "wiki_url": "", diff --git a/space_view3d_pie_menus/pie_apply_transform_menu.py b/space_view3d_pie_menus/pie_apply_transform_menu.py index 268ee550..a92920db 100644 --- a/space_view3d_pie_menus/pie_apply_transform_menu.py +++ b/space_view3d_pie_menus/pie_apply_transform_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Apply Transform Menu", "author": "pitiwazou, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View", "warning": "", "wiki_url": "", @@ -49,15 +49,15 @@ class PieApplyTransforms(Menu): # 4 - LEFT pie.operator("apply.transformall", text="Apply All", icon='FREEZE') # 6 - RIGHT - pie.operator("clear.all", text="Clear All", icon='MANIPUL') + pie.operator("clear.all", text="Clear All", icon='NONE') # 2 - BOTTOM pie.operator("object.duplicates_make_real", text="Make Duplicates Real") # 8 - TOP - pie.operator("apply.transformlocrotscale", text="Rotation", icon='MAN_ROT').option = 'ROT' + pie.operator("apply.transformlocrotscale", text="Rotation", icon='NONE').option = 'ROT' # 7 - TOP - LEFT - pie.operator("apply.transformlocrotscale", text="Location", icon='MAN_ROT').option = 'LOC' + pie.operator("apply.transformlocrotscale", text="Location", icon='NONE').option = 'LOC' # 9 - TOP - RIGHT - pie.operator("apply.transformlocrotscale", text="Scale", icon='MAN_ROT').option = 'SCALE' + pie.operator("apply.transformlocrotscale", text="Scale", icon='NONE').option = 'SCALE' # 1 - BOTTOM - LEFT pie.operator("object.visual_transform_apply", text="Visual Transforms") # 3 - BOTTOM - RIGHT @@ -109,10 +109,10 @@ class ClearMenu(Menu): def draw(self, context): layout = self.layout - layout.operator("object.location_clear", text="Clear Location", icon='MAN_TRANS') - layout.operator("object.rotation_clear", text="Clear Rotation", icon='MAN_ROT') - layout.operator("object.scale_clear", text="Clear Scale", icon='MAN_SCALE') - layout.operator("object.origin_clear", text="Clear Origin", icon='MANIPUL') + layout.operator("object.location_clear", text="Clear Location", icon='NONE') + layout.operator("object.rotation_clear", text="Clear Rotation", icon='NONE') + layout.operator("object.scale_clear", text="Clear Scale", icon='NONE') + layout.operator("object.origin_clear", text="Clear Origin", icon='NONE') # Clear all diff --git a/space_view3d_pie_menus/pie_cursor.py b/space_view3d_pie_menus/pie_cursor.py index 80ef0c41..337c0c12 100644 --- a/space_view3d_pie_menus/pie_cursor.py +++ b/space_view3d_pie_menus/pie_cursor.py @@ -23,7 +23,7 @@ bl_info = { "description": "Cursor Menu", "author": "pitiwazou, meta-androcto", "version": (0, 1, 0), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View", "warning": "", "wiki_url": "", @@ -69,16 +69,16 @@ class Snap_CursorMenu(Menu): icon='CLIPUV_HLT').use_offset = False # 6 - RIGHT pie.operator("view3d.snap_selected_to_cursor", - text="Selection to Cursor (Keep Offset)", icon='CURSOR').use_offset = True + text="Selection to Cursor (Keep Offset)", icon='PIVOT_CURSOR').use_offset = True # 2 - BOTTOM pie.operator("view3d.snap_cursor_selected_to_center1", - text="Selected & Cursor to World Origin", icon='ALIGN') + text="Selected & Cursor to Center", icon='NONE') # 8 - TOP pie.operator("view3d.snap_cursor_to_center", text="Cursor to World Origin", icon='CLIPUV_DEHLT') # 7 - TOP - LEFT - pie.operator("view3d.snap_cursor_to_selected", text="Cursor to Selected", icon='ROTACTIVE') + pie.operator("view3d.snap_cursor_to_selected", text="Cursor to Selected", icon='NONE') # 9 - TOP - RIGHT - pie.operator("view3d.snap_cursor_to_active", text="Cursor to Active", icon='BBOX') + pie.operator("view3d.snap_cursor_to_active", text="Cursor to Active", icon='NONE') # 1 - BOTTOM - LEFT pie.operator("view3d.snap_selected_to_grid", text="Selection to Grid", icon='GRID') # 3 - BOTTOM - RIGHT diff --git a/space_view3d_pie_menus/pie_delete_menu.py b/space_view3d_pie_menus/pie_delete_menu.py index 4a8e002c..0632877e 100644 --- a/space_view3d_pie_menus/pie_delete_menu.py +++ b/space_view3d_pie_menus/pie_delete_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Edit mode V/E/F Delete Modes", "author": "pitiwazou, meta-androcto", "version": (0, 1, 0), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "Mesh Edit Mode", "warning": "", "wiki_url": "", @@ -57,13 +57,13 @@ class PieDelete(Menu): # 1 - BOTTOM - LEFT box = pie.split().column() box.operator("mesh.dissolve_limited", text="Limited Dissolve", icon='STICKY_UVS_LOC') - box.operator("mesh.delete_edgeloop", text="Delete Edge Loops", icon='BORDER_LASSO') + box.operator("mesh.delete_edgeloop", text="Delete Edge Loops", icon='NONE') box.operator("mesh.edge_collapse", text="Edge Collapse", icon='UV_EDGESEL') # 3 - BOTTOM - RIGHT box = pie.split().column() - box.operator("mesh.delete", text="Only Edge & Faces", icon='SPACE2').type = 'EDGE_FACE' + box.operator("mesh.delete", text="Only Edge & Faces", icon='NONE').type = 'EDGE_FACE' box.operator("mesh.delete", text="Only Faces", icon='UV_FACESEL').type = 'ONLY_FACE' - box.operator("mesh.remove_doubles", text="Remove Doubles", icon='ORTHO') + box.operator("mesh.remove_doubles", text="Remove Doubles", icon='NONE') classes = ( diff --git a/space_view3d_pie_menus/pie_editor_switch_menu.py b/space_view3d_pie_menus/pie_editor_switch_menu.py index adbab7c2..093f46b6 100644 --- a/space_view3d_pie_menus/pie_editor_switch_menu.py +++ b/space_view3d_pie_menus/pie_editor_switch_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Switch Editor Type Menu", "author": "saidenka", "version": (0, 1, 0), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "All Editors", "warning": "", "wiki_url": "", @@ -73,15 +73,15 @@ class AreaPieEditor(Menu): # 6 - RIGHT pie.menu(AreaTypePieAnim.bl_idname, text="Animation Editors", icon="ACTION") # 2 - BOTTOM - pie.operator(SetAreaType.bl_idname, text="Property", icon="BUTS").types = "PROPERTIES" + pie.operator(SetAreaType.bl_idname, text="Property", icon="PROPERTIES").types = "PROPERTIES" # 8 - TOP pie.operator(SetAreaType.bl_idname, text="3D View", icon="MESH_CUBE").types = "VIEW_3D" # 7 - TOP - LEFT - pie.operator(SetAreaType.bl_idname, text="UV/Image Editor", icon="IMAGE_COL").types = "IMAGE_EDITOR" + pie.operator(SetAreaType.bl_idname, text="UV/Image Editor", icon="NONE").types = "IMAGE_EDITOR" # 9 - TOP - RIGHT pie.operator(SetAreaType.bl_idname, text="Node Editor", icon="NODETREE").types = "NODE_EDITOR" # 1 - BOTTOM - LEFT - pie.operator(SetAreaType.bl_idname, text="Outliner", icon="OOPS").types = "OUTLINER" + pie.operator(SetAreaType.bl_idname, text="Outliner", icon="NONE").types = "OUTLINER" # 3 - BOTTOM - RIGHT pie.menu(AreaTypePieOther.bl_idname, text="More Editors", icon="QUESTION") diff --git a/space_view3d_pie_menus/pie_manipulator_menu.py b/space_view3d_pie_menus/pie_manipulator_menu.py index 3a599483..834187a1 100644 --- a/space_view3d_pie_menus/pie_manipulator_menu.py +++ b/space_view3d_pie_menus/pie_manipulator_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Extended Manipulator Menu", "author": "pitiwazou, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View", "warning": "", "wiki_url": "", @@ -63,13 +63,13 @@ class PieManipulator(Menu): layout = self.layout pie = layout.menu_pie() # 4 - LEFT - pie.operator("wm.tool_set_by_name", text="Translate", icon='MAN_TRANS').name = "Move" + pie.operator("wm.tool_set_by_name", text="Translate", icon='NONE').name = "Move" # 6 - RIGHT - pie.operator("wm.tool_set_by_name", text="Scale", icon='MAN_SCALE').name = "Scale" + pie.operator("wm.tool_set_by_name", text="Scale", icon='NONE').name = "Scale" # 2 - BOTTOM - pie.operator("wm.tool_set_by_name", text="Rotate", icon='MAN_ROT').name = "Rotate" + pie.operator("wm.tool_set_by_name", text="Rotate", icon='NONE').name = "Rotate" # 8 - TOP - pie.operator("w.manupulators", text="Show/Hide Toggle", icon='MANIPUL') + pie.operator("w.manupulators", text="Show/Hide Toggle", icon='NONE') classes = ( diff --git a/space_view3d_pie_menus/pie_modes_menu.py b/space_view3d_pie_menus/pie_modes_menu.py index 74c0b79d..943e85ce 100644 --- a/space_view3d_pie_menus/pie_modes_menu.py +++ b/space_view3d_pie_menus/pie_modes_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Switch between 3d view object/edit modes", "author": "pitiwazou, meta-androcto, italic", "version": (0, 1, 2), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View", "warning": "", "wiki_url": "", @@ -276,7 +276,7 @@ class PieObjectEditotherModes(Menu): box.operator("verts.edges", text="Vertex/Edges", icon='VERTEXSEL') box.operator("verts.edgesfaces", text="Vertex/Edges/Faces", icon='OBJECT_DATAMODE') box.operator("wm.context_toggle", text="Limit to Visible", - icon="ORTHO").data_path = "space_data.use_occlude_geometry" + icon="NONE").data_path = "space_data.use_occlude_geometry" class PieObjectEditMode(Menu): diff --git a/space_view3d_pie_menus/pie_orientation_menu.py b/space_view3d_pie_menus/pie_orientation_menu.py index ea90862a..06873589 100644 --- a/space_view3d_pie_menus/pie_orientation_menu.py +++ b/space_view3d_pie_menus/pie_orientation_menu.py @@ -24,7 +24,7 @@ bl_info = { "name": "Hotkey: 'Alt + Spacebar'", "author": "Italic_", "version": (1, 1, 0), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "description": "Set Transform Orientations", "location": "3D View", "category": "Orientation Pie"} diff --git a/space_view3d_pie_menus/pie_origin.py b/space_view3d_pie_menus/pie_origin.py index 84344d7e..58f22d41 100644 --- a/space_view3d_pie_menus/pie_origin.py +++ b/space_view3d_pie_menus/pie_origin.py @@ -23,7 +23,7 @@ bl_info = { "description": "Origin Snap/Place Menu", "author": "pitiwazou, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View", "warning": "", "wiki_url": "", @@ -105,10 +105,10 @@ class PieOriginPivot(Menu): if obj and obj.type == 'MESH': # 4 - LEFT pie.operator("object.origin_set", text="Origin to Center of Mass", - icon='BBOX').type = 'ORIGIN_CENTER_OF_MASS' + icon='NONE').type = 'ORIGIN_CENTER_OF_MASS' # 6 - RIGHT pie.operator("object.origin_set", text="Origin To 3D Cursor", - icon='CURSOR').type = 'ORIGIN_CURSOR' + icon='PIVOT_CURSOR').type = 'ORIGIN_CURSOR' # 2 - BOTTOM pie.operator("object.pivotobottom", text="Origin to Bottom", icon='TRIA_DOWN') @@ -117,27 +117,27 @@ class PieOriginPivot(Menu): icon='SNAP_INCREMENT') # 7 - TOP - LEFT pie.operator("object.origin_set", text="Geometry To Origin", - icon='BBOX').type = 'GEOMETRY_ORIGIN' + icon='NONE').type = 'GEOMETRY_ORIGIN' # 9 - TOP - RIGHT pie.operator("object.origin_set", text="Origin To Geometry", - icon='ROTATE').type = 'ORIGIN_GEOMETRY' + icon='NONE').type = 'ORIGIN_GEOMETRY' else: # 4 - LEFT pie.operator("object.origin_set", text="Origin to Center of Mass", - icon='BBOX').type = 'ORIGIN_CENTER_OF_MASS' + icon='NONE').type = 'ORIGIN_CENTER_OF_MASS' # 6 - RIGHT pie.operator("object.origin_set", text="Origin To 3D Cursor", - icon='CURSOR').type = 'ORIGIN_CURSOR' + icon='PIVOT_CURSOR').type = 'ORIGIN_CURSOR' # 2 - BOTTOM pie.operator("object.pivot2selection", text="Origin To Selection", icon='SNAP_INCREMENT') # 8 - TOP pie.operator("object.origin_set", text="Origin To Geometry", - icon='ROTATE').type = 'ORIGIN_GEOMETRY' + icon='NONE').type = 'ORIGIN_GEOMETRY' # 7 - TOP - LEFT pie.operator("object.origin_set", text="Geometry To Origin", - icon='BBOX').type = 'GEOMETRY_ORIGIN' + icon='NONE').type = 'GEOMETRY_ORIGIN' classes = ( diff --git a/space_view3d_pie_menus/pie_pivot_point_menu.py b/space_view3d_pie_menus/pie_pivot_point_menu.py index df6600a3..157364ff 100644 --- a/space_view3d_pie_menus/pie_pivot_point_menu.py +++ b/space_view3d_pie_menus/pie_pivot_point_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Set Pivot Point Menu", "author": "seb_k, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View", "warning": "", "wiki_url": "", diff --git a/space_view3d_pie_menus/pie_proportional_menu.py b/space_view3d_pie_menus/pie_proportional_menu.py index 479b57d4..f1722ce1 100644 --- a/space_view3d_pie_menus/pie_proportional_menu.py +++ b/space_view3d_pie_menus/pie_proportional_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Proportional Object/Edit Tools", "author": "pitiwazou, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View Object & Edit modes", "warning": "", "wiki_url": "", diff --git a/space_view3d_pie_menus/pie_save_open_menu.py b/space_view3d_pie_menus/pie_save_open_menu.py index 8b7e56e0..a8307d07 100644 --- a/space_view3d_pie_menus/pie_save_open_menu.py +++ b/space_view3d_pie_menus/pie_save_open_menu.py @@ -21,7 +21,7 @@ bl_info = { "name": "Hotkey: 'Ctrl S'", "description": "Save/Open & File Menus", - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "All Editors", "warning": "", "wiki_url": "", @@ -46,17 +46,17 @@ class PieSaveOpen(Menu): layout = self.layout pie = layout.menu_pie() # 4 - LEFT - pie.operator("wm.read_homefile", text="New", icon='NEW') + pie.operator("wm.read_homefile", text="New", icon='FILE_NEW') # 6 - RIGHT pie.menu("pie.link", text="Link", icon='LINK_BLEND') # 2 - BOTTOM pie.menu("pie.fileio", text="Import/Export Menu", icon='IMPORT') # 8 - TOP - pie.operator("file.save_incremental", text="Incremental Save", icon='SAVE_COPY') + pie.operator("file.save_incremental", text="Incremental Save", icon='NONE') # 7 - TOP - LEFT pie.operator("wm.save_mainfile", text="Save", icon='FILE_TICK') # 9 - TOP - RIGHT - pie.operator("wm.save_as_mainfile", text="Save As...", icon='SAVE_AS') + pie.operator("wm.save_as_mainfile", text="Save As...", icon='NONE') # 1 - BOTTOM - LEFT pie.operator("wm.open_mainfile", text="Open file", icon='FILE_FOLDER') # 3 - BOTTOM - RIGHT @@ -84,7 +84,7 @@ class pie_recover(Menu): layout = self.layout pie = layout.menu_pie() box = pie.split().column() - box.operator("wm.recover_auto_save", text="Recover Auto Save...", icon='RECOVER_AUTO') + box.operator("wm.recover_auto_save", text="Recover Auto Save...", icon='NONE') box.operator("wm.recover_last_session", text="Recover Last Session", icon='RECOVER_LAST') box.operator("wm.revert_mainfile", text="Revert", icon='FILE_REFRESH') diff --git a/space_view3d_pie_menus/pie_sculpt_menu.py b/space_view3d_pie_menus/pie_sculpt_menu.py index 91f3147a..5c70718e 100644 --- a/space_view3d_pie_menus/pie_sculpt_menu.py +++ b/space_view3d_pie_menus/pie_sculpt_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Sculpt Brush Menu", "author": "pitiwazou, meta-androcto", "version": (0, 1, 0), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "W key", "warning": "", "wiki_url": "", @@ -123,7 +123,7 @@ class PieSculptthree(Menu): layout.operator("paint.brush_select", text='Snakehook', icon='BRUSH_SNAKE_HOOK').sculpt_tool = 'SNAKE_HOOK' layout.operator("paint.brush_select", - text='Twist', icon='BRUSH_ROTATE').sculpt_tool = 'ROTATE' + text='Twist', icon='BRUSH_ROTATE').sculpt_tool = 'NONE' classes = ( diff --git a/space_view3d_pie_menus/pie_select_menu.py b/space_view3d_pie_menus/pie_select_menu.py index e0e492eb..e47fb5e6 100644 --- a/space_view3d_pie_menus/pie_select_menu.py +++ b/space_view3d_pie_menus/pie_select_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Object/Edit mode Selection Menu", "author": "pitiwazou, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View", "warning": "", "wiki_url": "", @@ -44,7 +44,7 @@ class PieSelectionsMore(Menu): pie = layout.menu_pie() box = pie.split().column() box.operator("object.select_by_type", text="Select By Type", icon='SNAP_VOLUME') - box.operator("object.select_grouped", text="Select Grouped", icon='ROTATE') + box.operator("object.select_grouped", text="Select Grouped", icon='NONE') box.operator("object.select_linked", text="Select Linked", icon='CONSTRAINT_BONE') box.menu("VIEW3D_MT_select_object_more_less", text="More/Less") @@ -58,7 +58,7 @@ class PieSelectionsOM(Menu): layout = self.layout pie = layout.menu_pie() # 4 - LEFT - pie.operator("object.select_by_layer", text="Select By Layer", icon='LAYER_ACTIVE') + pie.row().label(text="") # 6 - RIGHT pie.operator("object.select_random", text="Select Random", icon='GROUP_VERTEX') # 2 - BOTTOM @@ -66,11 +66,11 @@ class PieSelectionsOM(Menu): icon='ZOOM_PREVIOUS').action = 'INVERT' # 8 - TOP pie.operator("object.select_all", text="Select All Toggle", - icon='RENDER_REGION').action = 'TOGGLE' + icon='NONE').action = 'TOGGLE' # 7 - TOP - LEFT - pie.operator("view3d.select_circle", text="Circle Select", icon='BORDER_LASSO') + pie.operator("view3d.select_circle", text="Circle Select", icon='NONE') # 9 - TOP - RIGHT - pie.operator("view3d.select_box", text="Box Select", icon='BORDER_RECT') + pie.operator("view3d.select_box", text="Box Select", icon='NONE') # 1 - BOTTOM - LEFT pie.operator("object.select_camera", text="Select Camera", icon='CAMERA_DATA') # 3 - BOTTOM - RIGHT @@ -87,7 +87,7 @@ class PieSelectionsEM(Menu): pie = layout.menu_pie() # 4 - LEFT pie.operator("view3d.select_box", text="Box Select", - icon='BORDER_RECT') + icon='NONE') # 6 - RIGHT pie.menu("object.selectloopselection", text="Select Loop Menu", icon='LOOPSEL') # 2 - BOTTOM @@ -104,7 +104,7 @@ class PieSelectionsEM(Menu): icon='FULLSCREEN_EXIT').action = 'INVERT' # 1 - BOTTOM - LEFT pie.operator("view3d.select_circle", text="Circle Select", - icon='BORDER_LASSO') + icon='NONE') # 3 - BOTTOM - RIGHT pie.menu("object.selectallbyselection", text="Multi Select Menu", icon='SNAP_EDGE') diff --git a/space_view3d_pie_menus/pie_shading_menu.py b/space_view3d_pie_menus/pie_shading_menu.py index e7eb03b9..26da5d45 100644 --- a/space_view3d_pie_menus/pie_shading_menu.py +++ b/space_view3d_pie_menus/pie_shading_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Viewport Shading Menus", "author": "pitiwazou, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3D View", "warning": "", "wiki_url": "", @@ -43,7 +43,7 @@ class PieShadingView(Menu): layout = self.layout pie = layout.menu_pie() - pie.prop(context.space_data, "viewport_shade", expand=True) + pie.prop(context.space_data.shading, "type", expand=True) if context.active_object: if context.mode == 'EDIT_MESH': diff --git a/space_view3d_pie_menus/pie_snap_menu.py b/space_view3d_pie_menus/pie_snap_menu.py index 19b4464f..9bcfd4ad 100644 --- a/space_view3d_pie_menus/pie_snap_menu.py +++ b/space_view3d_pie_menus/pie_snap_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Snap Element Menu", "author": "pitiwazou, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "3d View", "warning": "", "wiki_url": "", @@ -60,7 +60,7 @@ class PieSnaping(Menu): # 1 - BOTTOM - LEFT pie.operator("snap.alignrotation", text="Align rotation", icon='SNAP_NORMAL') # 3 - BOTTOM - RIGHT - pie.operator("wm.call_menu_pie", text="Snap Target", icon='SNAP_SURFACE').name = "snap.targetmenu" + pie.operator("wm.call_menu_pie", text="Snap Target", icon='NONE').name = "snap.targetmenu" class SnapActive(Operator): diff --git a/space_view3d_pie_menus/pie_views_numpad_menu.py b/space_view3d_pie_menus/pie_views_numpad_menu.py index 02cf5464..6c55bfe4 100644 --- a/space_view3d_pie_menus/pie_views_numpad_menu.py +++ b/space_view3d_pie_menus/pie_views_numpad_menu.py @@ -23,7 +23,7 @@ bl_info = { "description": "Viewport Numpad Menus", "author": "pitiwazou, meta-androcto", "version": (0, 1, 1), - "blender": (2, 77, 0), + "blender": (2, 80, 0), "location": "Q key", "warning": "", "wiki_url": "", @@ -108,17 +108,17 @@ class PieViewNumpad(Menu): rd = scene.render # 4 - LEFT - pie.operator("view3d.viewnumpad", text="Left", icon='TRIA_LEFT').type = 'LEFT' + pie.operator("view3d.view_axis", text="Left", icon='TRIA_LEFT').type = 'LEFT' # 6 - RIGHT - pie.operator("view3d.viewnumpad", text="Right", icon='TRIA_RIGHT').type = 'RIGHT' + pie.operator("view3d.view_axis", text="Right", icon='TRIA_RIGHT').type = 'RIGHT' # 2 - BOTTOM - pie.operator("view3d.viewnumpad", text="Bottom", icon='TRIA_DOWN').type = 'BOTTOM' + pie.operator("view3d.view_axis", text="Bottom", icon='TRIA_DOWN').type = 'BOTTOM' # 8 - TOP - pie.operator("view3d.viewnumpad", text="Top", icon='TRIA_UP').type = 'TOP' + pie.operator("view3d.view_axis", text="Top", icon='TRIA_UP').type = 'TOP' # 7 - TOP - LEFT - pie.operator("view3d.viewnumpad", text="Front").type = 'FRONT' + pie.operator("view3d.view_axis", text="Front").type = 'FRONT' # 9 - TOP - RIGHT - pie.operator("view3d.viewnumpad", text="Back").type = 'BACK' + pie.operator("view3d.view_axis", text="Back").type = 'BACK' # 1 - BOTTOM - LEFT box = pie.split().column() row = box.row(align=True) @@ -131,8 +131,8 @@ class PieViewNumpad(Menu): icon='LOCKED').data_path = "space_data.lock_camera" row = box.row(align=True) - row.operator("view3d.viewnumpad", text="View Cam", icon='VISIBLE_IPO_ON').type = 'CAMERA' - row.operator("view3d.camera_to_view", text="Cam to view", icon='MAN_TRANS') + row.operator("view3d.view_camera", text="View Cam", icon='VISIBLE_IPO_ON') + row.operator("view3d.camera_to_view", text="Cam to view", icon='NONE') icon_locked = 'LOCKED' if ob and ob.lock_rotation[0] is False else \ 'UNLOCKED' if ob and ob.lock_rotation[0] is True else 'LOCKED' @@ -143,7 +143,7 @@ class PieViewNumpad(Menu): row = box.row(align=True) row.prop(rd, "use_border", text="Border") # 3 - BOTTOM - RIGHT - pie.menu(PieViewallSelGlobEtc.bl_idname, text="View Menu", icon='BBOX') + pie.menu(PieViewallSelGlobEtc.bl_idname, text="View Menu", icon='NONE') classes = ( -- cgit v1.2.3