[Bf-extensions-cvs] [c43be86] master: Update 3d viewport pie menus: T48709 various fixes re: talk with @sebastian_k
meta-androcto
noreply at git.blender.org
Mon Jul 25 11:49:53 CEST 2016
Commit: c43be86344c48ce5b9809973b535d8eec1e11d3f
Author: meta-androcto
Date: Mon Jul 25 19:49:33 2016 +1000
Branches: master
https://developer.blender.org/rBACc43be86344c48ce5b9809973b535d8eec1e11d3f
Update 3d viewport pie menus: T48709 various fixes re: talk with @sebastian_k
===================================================================
M space_view3d_pie_menus/__init__.py
M space_view3d_pie_menus/pie_align_menu/__init__.py
M space_view3d_pie_menus/pie_animation_menu/__init__.py
M space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
M space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
M space_view3d_pie_menus/pie_manipulator_menu/__init__.py
M space_view3d_pie_menus/pie_modes_menu/__init__.py
M space_view3d_pie_menus/pie_origin_cursor/__init__.py
M space_view3d_pie_menus/pie_save_open_menu/__init__.py
M space_view3d_pie_menus/pie_sculpt_menu/__init__.py
===================================================================
diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
index 6d51fa1..b696c2f 100644
--- a/space_view3d_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -50,8 +50,10 @@ bl_info = {
'location': '',
'description': 'Pie Menu Activate',
'warning': '',
- 'wiki_url': '',
- 'category': 'User interface'
+ "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+ "Scripts3D_interaction/viewport_pies",
+ "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
+ 'category': 'User Interface'
}
diff --git a/space_view3d_pie_menus/pie_align_menu/__init__.py b/space_view3d_pie_menus/pie_align_menu/__init__.py
index 72a25f5..441fcf7 100644
--- a/space_view3d_pie_menus/pie_align_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_align_menu/__init__.py
@@ -17,6 +17,7 @@ from bpy.types import Menu, Header
from bpy.props import IntProperty, FloatProperty, BoolProperty
from mathutils import *
import math
+
# Pie Align - Alt + X
class PieAlign(Menu):
bl_idname = "pie.align"
@@ -64,6 +65,7 @@ class PieAlign(Menu):
class AlignX(bpy.types.Operator):
bl_idname = "align.x"
bl_label = "Align X"
+ bl_description = "Align Selected Along X"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
@@ -76,6 +78,7 @@ class AlignX(bpy.types.Operator):
class AlignY(bpy.types.Operator):
bl_idname = "align.y"
bl_label = "Align Y"
+ bl_description = "Align Selected Along Y"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
@@ -88,6 +91,7 @@ class AlignY(bpy.types.Operator):
class AlignZ(bpy.types.Operator):
bl_idname = "align.z"
bl_label = "Align Z"
+ bl_description = "Align Selected Along Z"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
@@ -103,7 +107,8 @@ class AlignZ(bpy.types.Operator):
# Align to X - 0
class AlignToX0(bpy.types.Operator):
bl_idname = "align.2x0"
- bl_label = "Align To X-0"
+ bl_label = "Align To X = 0"
+ bl_description = "Align Selected To Location X = 0"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
@@ -118,7 +123,8 @@ class AlignToX0(bpy.types.Operator):
# Align to Z - 0
class AlignToY0(bpy.types.Operator):
bl_idname = "align.2y0"
- bl_label = "Align To Y-0"
+ bl_label = "Align To Y = 0"
+ bl_description = "Align Selected To Location Y = 0"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
@@ -133,7 +139,8 @@ class AlignToY0(bpy.types.Operator):
# Align to Z - 0
class AlignToZ0(bpy.types.Operator):
bl_idname = "align.2z0"
- bl_label = "Align To Z-0"
+ bl_label = "Align To Z = 0"
+ bl_description = "Align Selected To Location Z = 0"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
diff --git a/space_view3d_pie_menus/pie_animation_menu/__init__.py b/space_view3d_pie_menus/pie_animation_menu/__init__.py
index 859b7b6..c6395fa 100644
--- a/space_view3d_pie_menus/pie_animation_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_animation_menu/__init__.py
@@ -49,6 +49,7 @@ class PieAnimation(Menu):
class InsertAutoKeyframe(bpy.types.Operator):
bl_idname = "insert.autokeyframe"
bl_label = "Insert Auto Keyframe"
+ bl_description = "Toggle Insert Auto Keyframe"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
diff --git a/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py b/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
index 8d26898..baea19b 100644
--- a/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
@@ -45,6 +45,7 @@ class PieApplyTransforms(Menu):
class ApplyTransformLocation(bpy.types.Operator):
bl_idname = "apply.transformlocation"
bl_label = "Apply Transform Location"
+ bl_description = "Apply Transform Location"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
@@ -55,6 +56,7 @@ class ApplyTransformLocation(bpy.types.Operator):
class ApplyTransformRotation(bpy.types.Operator):
bl_idname = "apply.transformrotation"
bl_label = "Apply Transform Rotation"
+ bl_description = "Apply Transform Rotation"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
@@ -65,6 +67,7 @@ class ApplyTransformRotation(bpy.types.Operator):
class ApplyTransformScale(bpy.types.Operator):
bl_idname = "apply.transformscale"
bl_label = "Apply Transform Scale"
+ bl_description = "Apply Transform Scale"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
@@ -75,6 +78,7 @@ class ApplyTransformScale(bpy.types.Operator):
class ApplyTransformRotationScale(bpy.types.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):
@@ -84,7 +88,8 @@ class ApplyTransformRotationScale(bpy.types.Operator):
# Apply Transforms
class ApplyTransformAll(bpy.types.Operator):
bl_idname = "apply.transformall"
- bl_label = "Apply Transform All"
+ bl_label = "Apply All Transforms"
+ bl_description = "Apply Transform All"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
@@ -119,6 +124,7 @@ class ClearMenu(bpy.types.Menu):
class ClearAll(bpy.types.Operator):
bl_idname = "clear.all"
bl_label = "Clear All"
+ bl_description = "Clear All Transforms"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
diff --git a/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py b/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
index 35ad231..8cb2518 100644
--- a/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
@@ -46,7 +46,7 @@ class AreaPieEditor(Menu):
# 6 - RIGHT
self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Outliner", icon="OOPS").type = "OUTLINER"
# 2 - BOTTOM
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Property", icon="BUTS").type = "PROPERTIES"
+ self.layout.menu_pie().operator("wm.call_menu_pie", text="More Types", icon="QUESTION").name = AreaTypePieOther.bl_idname
# 8 - TOP
self.layout.menu_pie().operator(SetAreaType.bl_idname, text="3D View", icon="MESH_CUBE").type = "VIEW_3D"
# 7 - TOP - LEFT
@@ -56,7 +56,7 @@ class AreaPieEditor(Menu):
# 1 - BOTTOM - LEFT
self.layout.menu_pie().operator("wm.call_menu_pie", text="Animation Pie", icon="ACTION").name = AreaTypePieAnim.bl_idname
# 3 - BOTTOM - RIGHT
- self.layout.menu_pie().operator("wm.call_menu_pie", text="More Types", icon="QUESTION").name = AreaTypePieOther.bl_idname
+ self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Property", icon="BUTS").type = "PROPERTIES"
class AreaTypePieOther(bpy.types.Menu):
@@ -72,11 +72,11 @@ class AreaTypePieOther(bpy.types.Menu):
# 2 - BOTTOM
self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Python Console", icon="CONSOLE").type = "CONSOLE"
# 8 - TOP
- self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Info", icon="INFO").type = "INFO"
+ 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"
# 9 - TOP - RIGHT
- self.layout.menu_pie().operator("wm.call_menu_pie", text="Back", icon="BACK").name = AreaPieEditor.bl_idname
+ self.layout.menu_pie().operator(SetAreaType.bl_idname, text="Info", icon="INFO").type = "INFO"
# 1 - BOTTOM - LEFT
# 3 - BOTTOM - RIGHT
diff --git a/space_view3d_pie_menus/pie_manipulator_menu/__init__.py b/space_view3d_pie_menus/pie_manipulator_menu/__init__.py
index b7b126b..b0412ca 100644
--- a/space_view3d_pie_menus/pie_manipulator_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_manipulator_menu/__init__.py
@@ -155,19 +155,19 @@ class PieManipulator(Menu):
layout = self.layout
pie = layout.menu_pie()
# 4 - LEFT
- pie.operator("translate.scale", text="Translate/Scale")
+ pie.operator("rotate.scale", text="Rotate/Scale")
# 6 - RIGHT
pie.operator("manip.rotate", text="Rotate", icon='MAN_ROT')
# 2 - BOTTOM
pie.operator("translate.rotatescale", text="Translate/Rotate/Scale")
# 8 - TOP
- pie.operator("w.manupulators", text="Manipulator", icon='MANIPUL')
+ pie.operator("w.manupulators", text="Show/Hide Toggle", icon='MANIPUL')
# 7 - TOP - LEFT
pie.operator("translate.rotate", text="Translate/Rotate")
# 9 - TOP - RIGHT
pie.operator("manip.translate", text="Translate", icon='MAN_TRANS')
# 1 - BOTTOM - LEFT
- pie.operator("rotate.scale", text="Rotate/Scale")
+ pie.operator("translate.scale", text="Translate/Scale")
# 3 - BOTTOM - RIGHT
pie.operator("manip.scale", text="Scale", icon='MAN_SCALE')
diff --git a/space_view3d_pie_menus/pie_modes_menu/__init__.py b/space_view3d_pie_menus/pie_modes_menu/__init__.py
index a22afdf..7827755 100644
--- a/space_view3d_pie_menus/pie_modes_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_modes_menu/__init__.py
@@ -235,19 +235,19 @@ class PieObjectEditotherModes(Menu):
# 4 - LEFT
pie.operator("verts.faces", text="Vertex/Faces", icon='LOOPSEL')
# 6 - RIGHT
- pie.operator("verts.edges", text="Vertex/Edges", icon='VERTEXSEL')
+ pie.operator("edges.faces", text="Edges/Faces", icon='FACESEL')
# 2 - BOTTOM
- pie.operator("verts.edgesfaces", text="Vertex/Edges/Faces", icon='OBJECT_DATAMODE')
+ pie.operator("wm.context_toggle", text="Limit to Visible", icon="ORTHO").data_path = "space_data.use_occlude_geometry"
# 8 - TOP
- pie.operator("class.ver
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list