[Bf-extensions-cvs] [e702810] master: Update 3d Viewport pie menus: T50732
meta-androcto
noreply at git.blender.org
Sun Mar 19 05:27:53 CET 2017
Commit: e702810f3734d8f35b29843cfb44956f125d0da7
Author: meta-androcto
Date: Sun Mar 19 15:27:10 2017 +1100
Branches: master
https://developer.blender.org/rBAe702810f3734d8f35b29843cfb44956f125d0da7
Update 3d Viewport pie menus: T50732
===================================================================
M space_view3d_pie_menus/__init__.py
M space_view3d_pie_menus/pie_align_menu.py
M space_view3d_pie_menus/pie_animation_menu.py
M space_view3d_pie_menus/pie_apply_transform_menu.py
M space_view3d_pie_menus/pie_editor_switch_menu.py
M space_view3d_pie_menus/pie_modes_menu.py
M space_view3d_pie_menus/pie_save_open_menu.py
M space_view3d_pie_menus/pie_sculpt_menu.py
M space_view3d_pie_menus/pie_select_menu.py
M space_view3d_pie_menus/pie_views_numpad_menu.py
===================================================================
diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
index 1c3bb34..101d742 100644
--- a/space_view3d_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -47,7 +47,8 @@ sub_modules_names = (
"pie_modes_menu",
"pie_views_numpad_menu",
"pie_sculpt_menu",
- "pie_origin_cursor",
+ "pie_origin",
+ "pie_cursor",
"pie_manipulator_menu",
"pie_snap_menu",
"pie_orientation_menu",
diff --git a/space_view3d_pie_menus/pie_align_menu.py b/space_view3d_pie_menus/pie_align_menu.py
index a743c2c..94b0e1c 100644
--- a/space_view3d_pie_menus/pie_align_menu.py
+++ b/space_view3d_pie_menus/pie_align_menu.py
@@ -60,6 +60,8 @@ class PieAlign(Menu):
# 9 - TOP - RIGHT
pie.operator("align.2z0", text="Align To Z-0")
# 1 - BOTTOM - LEFT
+ pie.separator()
+ # 3 - BOTTOM - RIGHT
# pie.menu("align.xyz")
box = pie.split().box().column()
row = box.row(align=True)
@@ -74,12 +76,6 @@ class PieAlign(Menu):
row.label("Z")
row.operator("alignz.bottom", text="Neg")
row.operator("alignz.top", text="Pos")
- # 3 - BOTTOM - RIGHT
-# box = pie.split().column()
-# row = box.row(align=True)
-# box.operator("mesh.vertex_align", icon='ALIGN', text="Align")
-# box.operator("retopo.space", icon='ALIGN', text="Distribute")
-# box.operator("mesh.vertex_inline", icon='ALIGN', text="Align & Distribute")
# Align X
diff --git a/space_view3d_pie_menus/pie_animation_menu.py b/space_view3d_pie_menus/pie_animation_menu.py
index 9c2b604..7f7a368 100644
--- a/space_view3d_pie_menus/pie_animation_menu.py
+++ b/space_view3d_pie_menus/pie_animation_menu.py
@@ -62,9 +62,9 @@ class PieAnimation(Menu):
# 9 - TOP - RIGHT
pie.operator("screen.keyframe_jump", text="Next FR", icon='NEXT_KEYFRAME').next = True
# 1 - BOTTOM - LEFT
- pie.operator("insert.autokeyframe", text="Auto Keyframe ", icon='REC')
+ pie.operator("insert.autokeyframe", text="Auto Keyframe", icon='REC')
# 3 - BOTTOM - RIGHT
- pie.menu("VIEW3D_MT_object_animation", icon="CLIP")
+ pie.menu("VIEW3D_MT_object_animation", text="Keyframe Menu", icon="KEYINGSET")
# Insert Auto Keyframe
diff --git a/space_view3d_pie_menus/pie_apply_transform_menu.py b/space_view3d_pie_menus/pie_apply_transform_menu.py
index a3f9e51..802de3d 100644
--- a/space_view3d_pie_menus/pie_apply_transform_menu.py
+++ b/space_view3d_pie_menus/pie_apply_transform_menu.py
@@ -51,7 +51,7 @@ class PieApplyTransforms(Menu):
# 6 - RIGHT
pie.operator("clear.all", text="Clear All", icon='MANIPUL')
# 2 - BOTTOM
- pie.menu("applymore.menu", text="More")
+ pie.operator("object.duplicates_make_real", text="Make Duplicates Real")
# 8 - TOP
pie.operator("apply.transformrotation", text="Rotation", icon='MAN_ROT')
# 7 - TOP - LEFT
@@ -59,9 +59,9 @@ class PieApplyTransforms(Menu):
# 9 - TOP - RIGHT
pie.operator("apply.transformscale", text="Scale", icon='MAN_SCALE')
# 1 - BOTTOM - LEFT
- pie.operator("apply.transformrotationscale", text="Rotation/Scale")
+ pie.operator("object.visual_transform_apply", text="Visual Transforms")
# 3 - BOTTOM - RIGHT
- pie.menu("clear.menu", text="Clear Transforms")
+ pie.menu("clear.menu", text="Clear Transform Menu")
# Apply Transforms
@@ -102,22 +102,9 @@ class ApplyTransformScale(Operator):
bpy.ops.object.transform_apply(location=False, rotation=False, scale=True)
return {'FINISHED'}
-# Apply Transforms
-
-
-class ApplyTransformRotationScale(Operator):
- bl_idname = "apply.transformrotationscale"
- bl_label = "Apply Transform Rotation Scale"
- bl_description = "Apply Transform Rotation Scale"
- bl_options = {'REGISTER', 'UNDO'}
-
- def execute(self, context):
- bpy.ops.object.transform_apply(location=False, rotation=True, scale=True)
- return {'FINISHED'}
# Apply Transforms
-
class ApplyTransformAll(Operator):
bl_idname = "apply.transformall"
bl_label = "Apply All Transforms"
@@ -128,18 +115,6 @@ class ApplyTransformAll(Operator):
bpy.ops.object.transform_apply(location=True, rotation=True, scale=True)
return {'FINISHED'}
-# More Menu
-
-
-class TransformApplyMore(Menu):
- bl_idname = "applymore.menu"
- bl_label = "More Menu"
-
- def draw(self, context):
- layout = self.layout
- layout.operator("object.visual_transform_apply", text="Visual Transforms")
- layout.operator("object.duplicates_make_real", text="Make Duplicates Real")
-
# Clear Menu
@@ -174,11 +149,9 @@ classes = (
ApplyTransformLocation,
ApplyTransformRotation,
ApplyTransformScale,
- ApplyTransformRotationScale,
ApplyTransformAll,
ClearMenu,
ClearAll,
- TransformApplyMore,
)
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 2f206bf..710c8fe 100644
--- a/space_view3d_pie_menus/pie_editor_switch_menu.py
+++ b/space_view3d_pie_menus/pie_editor_switch_menu.py
@@ -65,22 +65,24 @@ class AreaPieEditor(Menu):
bl_label = "Editor Switch"
def draw(self, context):
+ layout = self.layout
+ pie = layout.menu_pie()
# 4 - LEFT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Text Editor", icon="TEXT").type = "TEXT_EDITOR"
+ pie.operator(SetAreaType.bl_idname, text="Text Editor", icon="TEXT").type = "TEXT_EDITOR"
# 6 - RIGHT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Outliner", icon="OOPS").type = "OUTLINER"
+ pie.menu(AreaTypePieAnim.bl_idname, text="Animation Editors", icon="ACTION")
# 2 - BOTTOM
- self.layout.menu_pie().operator("wm.call_menu_pie", text="More Types", icon="QUESTION").name = AreaTypePieOther.bl_idname
+ pie.operator(SetAreaType.bl_idname, text="Property", icon="BUTS").type = "PROPERTIES"
# 8 - TOP
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="3D View", icon="MESH_CUBE").type = "VIEW_3D"
+ pie.operator(SetAreaType.bl_idname, text="3D View", icon="MESH_CUBE").type = "VIEW_3D"
# 7 - TOP - LEFT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="UV/Image Editor", icon="IMAGE_COL").type = "IMAGE_EDITOR"
+ pie.operator(SetAreaType.bl_idname, text="UV/Image Editor", icon="IMAGE_COL").type = "IMAGE_EDITOR"
# 9 - TOP - RIGHT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Node Editor", icon="NODETREE").type = "NODE_EDITOR"
+ pie.operator(SetAreaType.bl_idname, text="Node Editor", icon="NODETREE").type = "NODE_EDITOR"
# 1 - BOTTOM - LEFT
- self.layout.menu_pie().operator("wm.call_menu_pie", text="Animation Pie", icon="ACTION").name = AreaTypePieAnim.bl_idname
+ pie.operator(SetAreaType.bl_idname, text="Outliner", icon="OOPS").type = "OUTLINER"
# 3 - BOTTOM - RIGHT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Property", icon="BUTS").type = "PROPERTIES"
+ pie.menu(AreaTypePieOther.bl_idname, text="More Editors", icon="QUESTION")
class AreaTypePieOther(Menu):
@@ -90,17 +92,16 @@ class AreaTypePieOther(Menu):
def draw(self, context):
# 4 - LEFT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Logic Editor", icon="LOGIC").type = "LOGIC_EDITOR"
+ self.layout.operator(SetAreaType.bl_idname, text="Logic Editor", icon="LOGIC").type = "LOGIC_EDITOR"
# 6 - RIGHT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="File Browser", icon="FILESEL").type = "FILE_BROWSER"
+ self.layout.operator(SetAreaType.bl_idname, text="File Browser", icon="FILESEL").type = "FILE_BROWSER"
# 2 - BOTTOM
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Python Console", icon="CONSOLE").type = "CONSOLE"
+ self.layout.operator(SetAreaType.bl_idname, text="Python Console", icon="CONSOLE").type = "CONSOLE"
# 8 - TOP
- self.layout.menu_pie().operator("wm.call_menu_pie", text="Back", icon="BACK").name = AreaPieEditor.bl_idname
# 7 - TOP - LEFT
- self.layout.menu_pie().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.menu_pie().operator(SetAreaType.bl_idname, text="Info", icon="INFO").type = "INFO"
+ self.layout.operator(SetAreaType.bl_idname, text="Info", icon="INFO").type = "INFO"
# 1 - BOTTOM - LEFT
# 3 - BOTTOM - RIGHT
@@ -125,19 +126,19 @@ class AreaTypePieAnim(Menu):
def draw(self, context):
# 4 - LEFT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="NLA Editor", icon="NLA").type = "NLA_EDITOR"
+ self.layout.operator(SetAreaType.bl_idname, text="NLA Editor", icon="NLA").type = "NLA_EDITOR"
# 6 - RIGHT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="DopeSheet", icon="ACTION").type = "DOPESHEET_EDITOR"
+ self.layout.operator(SetAreaType.bl_idname, text="DopeSheet", icon="ACTION").type = "DOPESHEET_EDITOR"
# 2 - BOTTOM
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Graph Editor", icon="IPO").type = "GRAPH_EDITOR"
+ self.layout.operator(SetAreaType.bl_idname, text="Graph Editor", icon="IPO").type = "GRAPH_EDITOR"
# 8 - TOP
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Timeline", icon="TIME").type = "TIMELINE"
+ self.layout.operator(SetAreaType.bl_idname, text="Timeline", icon="TIME").type = "TIMELINE"
# 7 - TOP - LEFT
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Video Sequence Editor", icon="SEQUENCE").type = "SEQUENCE_EDITOR"
+ self.layout.operator(SetAreaType.bl_idname, text="Video Sequence
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list