diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-25 19:07:30 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-25 19:22:49 +0400 |
| commit | 18060d863207d98a06b743437f2353516605436e (patch) | |
| tree | 12c659f67eca3ed79e8ab81f267f86bb5faf25a4 /release | |
| parent | dd86773969e6eb6db69495dfee07688fe4bdf8bd (diff) | |
Fix T39895: Displaying the armature layers popup in edit mode always fails.
In fact, armature layers operators (set layers, and show all) were kind of messy and broken
in Edit mode (Select layers had two different operators for Pose and Edit modes, both
using the same funcs that could only work in Pose mode, Show All was supposed to be
used in both modes but again, its exec code could only work in Pose one).
Fixed that by:
* Using only one op for each task, for both modes (with adapted poll func).
* Replacing 'object from context' access by an helper that returns the right Armature
object in both Edit and Pose modes.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/presets/keyconfig/3dsmax.py | 2 | ||||
| -rw-r--r-- | release/scripts/presets/keyconfig/maya.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py index 19f1c23b5ab..808ba7cee81 100644 --- a/release/scripts/presets/keyconfig/3dsmax.py +++ b/release/scripts/presets/keyconfig/3dsmax.py @@ -270,7 +270,7 @@ kmi.properties.name = 'VIEW3D_MT_bone_options_enable' kmi = km.keymap_items.new('wm.call_menu', 'W', 'PRESS', alt=True) kmi.properties.name = 'VIEW3D_MT_bone_options_disable' kmi = km.keymap_items.new('armature.layers_show_all', 'ACCENT_GRAVE', 'PRESS', ctrl=True) -kmi = km.keymap_items.new('pose.armature_layers', 'M', 'PRESS', shift=True) +kmi = km.keymap_items.new('armature.armature_layers', 'M', 'PRESS', shift=True) kmi = km.keymap_items.new('pose.bone_layers', 'M', 'PRESS') kmi = km.keymap_items.new('transform.transform', 'S', 'PRESS', ctrl=True, alt=True) kmi.properties.mode = 'BONE_SIZE' diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py index 9becc1091eb..3a5a6c7570a 100644 --- a/release/scripts/presets/keyconfig/maya.py +++ b/release/scripts/presets/keyconfig/maya.py @@ -326,7 +326,7 @@ kmi.properties.name = 'VIEW3D_MT_pose_group' kmi = km.keymap_items.new('wm.call_menu', 'RIGHTMOUSE', 'PRESS') kmi.properties.name = 'VIEW3D_MT_bone_options_toggle' kmi = km.keymap_items.new('armature.layers_show_all', 'ACCENT_GRAVE', 'PRESS', ctrl=True) -kmi = km.keymap_items.new('pose.armature_layers', 'M', 'PRESS', shift=True) +kmi = km.keymap_items.new('armature.armature_layers', 'M', 'PRESS', shift=True) kmi = km.keymap_items.new('pose.bone_layers', 'M', 'PRESS') kmi = km.keymap_items.new('transform.transform', 'S', 'PRESS', ctrl=True, alt=True) kmi = km.keymap_items.new('anim.keyframe_insert_menu', 'S', 'PRESS') diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index a433832c96e..2697feec3c3 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1786,7 +1786,7 @@ class VIEW3D_MT_pose(Menu): layout.separator() layout.operator_context = 'INVOKE_AREA' - layout.operator("pose.armature_layers", text="Change Armature Layers...") + layout.operator("armature.armature_layers", text="Change Armature Layers...") layout.operator("pose.bone_layers", text="Change Bone Layers...") layout.separator() |