diff options
| author | lijenstina <lijenstina@gmail.com> | 2017-06-10 01:25:27 +0300 |
|---|---|---|
| committer | lijenstina <lijenstina@gmail.com> | 2017-06-10 01:25:27 +0300 |
| commit | 940bd28434a27f00eaeac9ab9503cbf804e1087f (patch) | |
| tree | cac7e2d8f9862ad213059a2869bbc7f65c4f87f4 | |
| parent | aa8f255c0eaf31b2665d6adf0569da4892d8d1a4 (diff) | |
3D Viewport Pie Menus: Fix crash with the Editor Switch Menu
Bumped version to 1.1.4
Fix the crash in pie_editor_switch_menu linking non existent
classes - probably missed in some previous commits
Minor cleanup of the long lines
Update wiki links
| -rw-r--r-- | space_view3d_pie_menus/__init__.py | 5 | ||||
| -rw-r--r-- | space_view3d_pie_menus/pie_editor_switch_menu.py | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py index 101d7426..5a08426f 100644 --- a/space_view3d_pie_menus/__init__.py +++ b/space_view3d_pie_menus/__init__.py @@ -21,14 +21,13 @@ bl_info = { "name": "3D Viewport Pie Menus", "author": "meta-androcto, pitiwazou, chromoly, italic", - "version": (1, 1, 3), + "version": (1, 1, 4), "blender": (2, 7, 7), "description": "Individual Pie Menu Activation List", "location": "Addons Preferences", "warning": "", - "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/" + "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/" "Scripts/3D_interaction/viewport_pies", - "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/", "category": "Pie Menu" } diff --git a/space_view3d_pie_menus/pie_editor_switch_menu.py b/space_view3d_pie_menus/pie_editor_switch_menu.py index 710c8fe1..788b053d 100644 --- a/space_view3d_pie_menus/pie_editor_switch_menu.py +++ b/space_view3d_pie_menus/pie_editor_switch_menu.py @@ -56,7 +56,8 @@ class AreaTypePieOperator(Operator): bl_options = {'REGISTER', 'UNDO'} def execute(self, context): - bpy.ops.wm.call_menu_pie(name=AreaTypeEditor.bl_idname) + bpy.ops.wm.call_menu_pie(name=AreaPieEditor.bl_idname) + return {'FINISHED'} @@ -99,7 +100,8 @@ class AreaTypePieOther(Menu): self.layout.operator(SetAreaType.bl_idname, text="Python Console", icon="CONSOLE").type = "CONSOLE" # 8 - TOP # 7 - TOP - LEFT - self.layout.operator(SetAreaType.bl_idname, text="User Setting", icon="PREFERENCES").type = "USER_PREFERENCES" + self.layout.operator(SetAreaType.bl_idname, text="User Setting", + icon="PREFERENCES").type = "USER_PREFERENCES" # 9 - TOP - RIGHT self.layout.operator(SetAreaType.bl_idname, text="Info", icon="INFO").type = "INFO" # 1 - BOTTOM - LEFT @@ -134,13 +136,16 @@ class AreaTypePieAnim(Menu): # 8 - TOP self.layout.operator(SetAreaType.bl_idname, text="Timeline", icon="TIME").type = "TIMELINE" # 7 - TOP - LEFT - self.layout.operator(SetAreaType.bl_idname, text="Video Sequence Editor", icon="SEQUENCE").type = "SEQUENCE_EDITOR" + self.layout.operator(SetAreaType.bl_idname, + text="Video Sequence Editor", icon="SEQUENCE").type = "SEQUENCE_EDITOR" # 9 - TOP - RIGHT - self.layout.operator(SetAreaType.bl_idname, text="Video Clip Editor", icon="RENDER_ANIMATION").type = "CLIP_EDITOR" + self.layout.operator(SetAreaType.bl_idname, + text="Video Clip Editor", icon="RENDER_ANIMATION").type = "CLIP_EDITOR" # 1 - BOTTOM - LEFT - self.layout.operator("wm.call_menu_pie", text="Back", icon="BACK").name = PieEditor.bl_idname + self.layout.operator("wm.call_menu_pie", text="Back", icon="BACK").name = AreaPieEditor.bl_idname # 3 - BOTTOM - RIGHT + classes = ( AreaPieMenu, AreaTypePieOperator, @@ -180,5 +185,6 @@ def unregister(): if kmi.properties.name == "wm.area_type_pie_operator": km.keymap_items.remove(kmi) + if __name__ == "__main__": register() |