[Bf-extensions-cvs] [686044b] master: Rename ui_pie_menus/ to space_view3d_pie_menus update menu structure, clean up
meta-androcto
noreply at git.blender.org
Sat Jun 25 13:56:58 CEST 2016
Commit: 686044b245da24a257e0c710f9153d68adced81a
Author: meta-androcto
Date: Sat Jun 25 21:56:26 2016 +1000
Branches: master
https://developer.blender.org/rBAC686044b245da24a257e0c710f9153d68adced81a
Rename ui_pie_menus/ to space_view3d_pie_menus update menu structure, clean up
===================================================================
A space_view3d_pie_menus/__init__.py
A space_view3d_pie_menus/pie_align_menu/__init__.py
A space_view3d_pie_menus/pie_animation_menu/__init__.py
A space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
A space_view3d_pie_menus/pie_delete_menu/__init__.py
A space_view3d_pie_menus/pie_manipulator_menu/__init__.py
A space_view3d_pie_menus/pie_modes_menu/__init__.py
A space_view3d_pie_menus/pie_orientation_menu/__init__.py
A space_view3d_pie_menus/pie_origin_cursor/__init__.py
A space_view3d_pie_menus/pie_pivot_point_menu/__init__.py
A space_view3d_pie_menus/pie_proportional_menu/__init__.py
A space_view3d_pie_menus/pie_save_open_menu/__init__.py
A space_view3d_pie_menus/pie_sculpt_menu/__init__.py
A space_view3d_pie_menus/pie_select_menu/__init__.py
A space_view3d_pie_menus/pie_shading_menu/__init__.py
A space_view3d_pie_menus/pie_snap_menu/__init__.py
A space_view3d_pie_menus/pie_views_numpad_menu/__init__.py
A space_view3d_pie_menus/utils.py
D ui_pie_menus/__init__.py
D ui_pie_menus/pie_align_menu/__init__.py
D ui_pie_menus/pie_animation_menu/__init__.py
D ui_pie_menus/pie_apply_transform_menu/__init__.py
D ui_pie_menus/pie_delete_menu/__init__.py
D ui_pie_menus/pie_manipulator_menu/__init__.py
D ui_pie_menus/pie_modes_menu/__init__.py
D ui_pie_menus/pie_orientation_menu/__init__.py
D ui_pie_menus/pie_origin_cursor/__init__.py
D ui_pie_menus/pie_pivot_point_menu/__init__.py
D ui_pie_menus/pie_proportional_menu/__init__.py
D ui_pie_menus/pie_save_open_menu/__init__.py
D ui_pie_menus/pie_sculpt_menu/__init__.py
D ui_pie_menus/pie_select_menu/__init__.py
D ui_pie_menus/pie_shading_menu/__init__.py
D ui_pie_menus/pie_snap_menu/__init__.py
D ui_pie_menus/pie_text_editor_menu/__init__.py
D ui_pie_menus/pie_views_numpad_menu/__init__.py
D ui_pie_menus/utils.py
===================================================================
diff --git a/ui_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
similarity index 98%
rename from ui_pie_menus/__init__.py
rename to space_view3d_pie_menus/__init__.py
index 6fbc108..749e327 100644
--- a/ui_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -38,7 +38,6 @@ from . import pie_align_menu
from . import pie_delete_menu
from . import pie_apply_transform_menu
from . import pie_select_menu
-from . import pie_text_editor_menu
from . import pie_animation_menu
from . import pie_save_open_menu
@@ -46,13 +45,13 @@ from . import pie_save_open_menu
bl_info = {
'name': 'UI Pie Menu',
'author': 'meta-androcto, pitiwazou',
- 'version': (1, 1, 1),
+ 'version': (1, 1, 2),
'blender': (2, 7, 7),
'location': '',
'description': 'Pie Menu Activate',
'warning': '',
'wiki_url': '',
- 'category': 'User Interface'
+ 'category': '3D View'
}
@@ -71,7 +70,6 @@ sub_modules = [
pie_delete_menu,
pie_apply_transform_menu,
pie_select_menu,
- pie_text_editor_menu,
pie_animation_menu,
pie_save_open_menu,
]
diff --git a/ui_pie_menus/pie_align_menu/__init__.py b/space_view3d_pie_menus/pie_align_menu/__init__.py
similarity index 100%
rename from ui_pie_menus/pie_align_menu/__init__.py
rename to space_view3d_pie_menus/pie_align_menu/__init__.py
diff --git a/ui_pie_menus/pie_animation_menu/__init__.py b/space_view3d_pie_menus/pie_animation_menu/__init__.py
similarity index 100%
rename from ui_pie_menus/pie_animation_menu/__init__.py
rename to space_view3d_pie_menus/pie_animation_menu/__init__.py
diff --git a/ui_pie_menus/pie_apply_transform_menu/__init__.py b/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
similarity index 100%
rename from ui_pie_menus/pie_apply_transform_menu/__init__.py
rename to space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
diff --git a/ui_pie_menus/pie_delete_menu/__init__.py b/space_view3d_pie_menus/pie_delete_menu/__init__.py
similarity index 97%
rename from ui_pie_menus/pie_delete_menu/__init__.py
rename to space_view3d_pie_menus/pie_delete_menu/__init__.py
index cbb6ae3..2cd5619 100644
--- a/ui_pie_menus/pie_delete_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_delete_menu/__init__.py
@@ -47,6 +47,7 @@ class PieDelete(Menu):
row = box.row(align=True)
box.operator("mesh.delete", text="Only Edge & Faces", icon='SPACE2').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')
# Limited Dissolve
class DeleteLimitedDissolve(bpy.types.Operator):
diff --git a/ui_pie_menus/pie_manipulator_menu/__init__.py b/space_view3d_pie_menus/pie_manipulator_menu/__init__.py
similarity index 99%
rename from ui_pie_menus/pie_manipulator_menu/__init__.py
rename to space_view3d_pie_menus/pie_manipulator_menu/__init__.py
index 8f0acdc..0624252 100644
--- a/ui_pie_menus/pie_manipulator_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_manipulator_menu/__init__.py
@@ -169,7 +169,7 @@ class PieManipulator(Menu):
# 1 - BOTTOM - LEFT
pie.operator("rotate.scale", text="Rotate/Scale")
# 3 - BOTTOM - RIGHT
- pie.operator("manip.scale", text="scale", icon='MAN_SCALE')
+ pie.operator("manip.scale", text="Scale", icon='MAN_SCALE')
# Pie Snapping - Shift + Tab
diff --git a/ui_pie_menus/pie_modes_menu/__init__.py b/space_view3d_pie_menus/pie_modes_menu/__init__.py
similarity index 88%
rename from ui_pie_menus/pie_modes_menu/__init__.py
rename to space_view3d_pie_menus/pie_modes_menu/__init__.py
index 0f12319..903b90b 100644
--- a/ui_pie_menus/pie_modes_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_modes_menu/__init__.py
@@ -247,11 +247,7 @@ class PieObjectEditotherModes(Menu):
# 1 - BOTTOM - LEFT
pie.operator("edges.faces", text="Edges/Faces", icon='FACESEL')
# 3 - BOTTOM - RIGHT
- box = pie.split().column()
- row = box.row(align=True)
- row.prop(toolsettings, "use_mesh_automerge", text="Auto Merge")
- row = box.row(align=True)
- row.operator("wm.context_toggle", text="Limit to Visible", icon="ORTHO").data_path = "space_data.use_occlude_geometry"
+ pie.operator("wm.context_toggle", text="Limit to Visible", icon="ORTHO").data_path = "space_data.use_occlude_geometry"
# Pie Modes Switch- Tab key
class PieObjectEditMode(Menu):
@@ -261,62 +257,72 @@ class PieObjectEditMode(Menu):
def draw(self, context):
layout = self.layout
toolsettings = context.tool_settings
- ob = context
+ ob = context.object
- if ob.object.type == 'MESH':
+ if ob and ob.type == 'MESH' and ob.mode in {'OBJECT', 'SCULPT', 'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT', 'PARTICLE'}:
pie = layout.menu_pie()
# 4 - LEFT
pie.operator("class.pieweightpaint", text="Weight Paint", icon='WPAINT_HLT')
# 6 - RIGHT
pie.operator("class.pietexturepaint", text="Texture Paint", icon='TPAINT_HLT')
# 2 - BOTTOM
- pie.operator("wm.call_menu_pie", text="Edit Modes", icon='TPAINT_HLT').name = "pie.objecteditmodeothermodes"
+ pie.operator("sculpt.sculptmode_toggle", text="Sculpt", icon='SCULPTMODE_HLT')
# 8 - TOP
pie.operator("class.object", text="Edit/Object", icon='OBJECT_DATAMODE')
# 7 - TOP - LEFT
pie.operator("class.pievertexpaint", text="Vertex Paint", icon='VPAINT_HLT')
# 9 - TOP - RIGHT
- pie.operator("sculpt.sculptmode_toggle", text="Sculpt", icon='SCULPTMODE_HLT')
+ pie.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
# 1 - BOTTOM - LEFT
- pie.operator("class.pieparticleedit", text="Particle Edit", icon='PARTICLEMODE')
+ if bpy.context.object.particle_systems:
+ pie.operator("class.pieparticleedit", text="Particle Edit", icon='PARTICLEMODE')
# 3 - BOTTOM - RIGHT
+ if ob and ob.type == 'MESH' and ob.mode in {'EDIT'}:
+ pie = layout.menu_pie()
+ # 4 - LEFT
+ pie.operator("class.pieweightpaint", text="Weight Paint", icon='WPAINT_HLT')
+ # 6 - RIGHT
+ pie.operator("class.pietexturepaint", text="Texture Paint", icon='TPAINT_HLT')
+ # 2 - BOTTOM
+ pie.operator("sculpt.sculptmode_toggle", text="Sculpt", icon='SCULPTMODE_HLT')
+ # 8 - TOP
+ pie.operator("class.object", text="Edit/Object", icon='OBJECT_DATAMODE')
+ # 7 - TOP - LEFT
+ pie.operator("class.pievertexpaint", text="Vertex Paint", icon='VPAINT_HLT')
+ # 9 - TOP - RIGHT
+ pie.operator("wm.call_menu_pie", text="Edit Modes", icon='TPAINT_HLT').name = "pie.objecteditmodeothermodes"
+ # 1 - BOTTOM - LEFT
+ if bpy.context.object.particle_systems:
+ pie.operator("class.pieparticleedit", text="Particle Edit", icon='PARTICLEMODE')
+ # 3 - BOTTOM - RIGHT
- elif ob.object.type == 'CURVE':
+ if ob and ob.type == 'CURVE':
pie = layout.menu_pie()
pie.operator("object.editmode_toggle", text="Edit/Object", icon='OBJECT_DATAMODE')
- elif ob.object.type == 'ARMATURE':
+ if ob and ob.type == 'ARMATURE':
pie = layout.menu_pie()
pie.operator("object.editmode_toggle", text="Edit Mode", icon='OBJECT_DATAMODE')
pie.operator("object.posemode_toggle", text="Pose", icon='POSE_HLT')
pie.operator("class.object", text="Object Mode", icon='OBJECT_DATAMODE')
- elif ob.object.type == 'FONT':
- pie = layout.menu_pie()
- pie.operator("object.editmode_toggle", text="Edit/Object", icon='OBJECT_DATAMODE')
-
- elif ob.object.type == 'SURFACE':
- pie = layout.menu_pie()
- pie.operator("object.editmode_toggle", text="Edit/Object", icon='OBJECT_DATAMODE')
-
- elif ob.object.type == 'ARMATURE':
+ if ob and ob.type == 'FONT':
pie = layout.menu_pie()
pie.operator("object.editmode_toggle", text="Edit/Object", icon='OBJECT_DATAMODE')
- elif ob.object.type == 'META':
+ if ob and ob.type == 'SURFACE':
pie = layout.menu_pie()
pie.operator("object.editmode_toggle", text="Edit/Object", icon='OBJECT_DATAMODE')
- elif ob.object.type == 'LATTICE':
+ if ob and ob.type == 'META':
pie = layout.menu_pie()
pie.operator("object.editmode_toggle", text="Edit/Object", icon='OBJECT_DATAMODE')
- elif ob.object.type == 'ARMATURE':
+ if ob and ob.type == 'LATTICE':
pie = layout.menu_pie()
pie.operator("object.editmode_toggle", text="Edit/Object", icon='OBJECT_DATAMODE')
-
classes = [
PieObjectEditMode,
ClassObject,
diff --git a/space_view3d_pie_menus/pie_orientation_menu/__init__.py b/space_view3d_pie_menus/pie_orientation_menu/__init__.py
new file mode 100644
index 0000000..8bd28d5
--- /dev/null
+++ b/space_view3d_pie_menus/pie_orientation_menu/__init__.py
@@ -0,0 +1,89 @@
+"""Replace default list-style menu for transform orientations with a pie."""
+
+bl_info = {
+ "name": "Orientation Pie",
+ "author": "Italic_",
+ "version": (1, 1, 0),
+ "blender": (2, 77, 0),
+ "description": "",
+ "location": "Hotkey: ALT + Spacebar",
+ "category": "Pie Menu"}
+
+
+import bpy
+from bpy.types import Menu, Operator
+
+
+class OrientPoll(Operator):
+ bl_idname = "pie.orientation"
+ bl_label = "Orientation Poll"
+ bl_options = {'INTERNAL'}
+ space = bpy.props.StringProperty()
+
+ @classmethod
+ def poll(cls, context):
+ return bpy.context.space_data.type == "VIEW_3D"
+
+ def execute(self, context):
+ bpy.context.space_data.transform_orientation = self.space
+ return {'FINISHED'}
+
+
+class OrientPie(Menu):
+ bl_label = "Transform Orientation"
+
+ def draw(self, context):
+ layout = self.layout
+ pie =
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list