diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-18 06:43:53 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-18 06:43:53 +0400 |
| commit | 08232350d5797302e3638e69ec78657d853976aa (patch) | |
| tree | ad5ff38236343cdcb5eee6d8c6711cb1b32a1912 /source/blender/editors/armature/armature_ops.c | |
| parent | 5b31d545dfae5ee3fd5f4a5d0e9497a1c7c2a86b (diff) | |
| parent | a6d62bf0db09ae2759fd45abb3af563fefc13690 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32200:32300
Diffstat (limited to 'source/blender/editors/armature/armature_ops.c')
| -rw-r--r-- | source/blender/editors/armature/armature_ops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index 535cc62caf6..78b0b2e5e0d 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -273,8 +273,10 @@ void ED_keymap_armature(wmKeyConfig *keyconf) keymap= WM_keymap_find(keyconf, "Pose", 0, 0); keymap->poll= ED_operator_posemode; - // XXX: set parent is object-based operator, but it should also be available here... + /* set parent and add object are object-based operators, but we make them + available here because it's useful to do in pose mode too */ WM_keymap_add_item(keymap, "OBJECT_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_menu(keymap, "INFO_MT_add", AKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "POSE_OT_hide", HKEY, KM_PRESS, 0, 0); kmi= WM_keymap_add_item(keymap, "POSE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0); |