diff options
author | Matt Ebb <matt@mke3.net> | 2010-01-11 08:55:34 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-01-11 08:55:34 +0300 |
commit | 1f12e8c59f9bcdcef8b632b2a93d1b1875209b27 (patch) | |
tree | 2fa641c12fab07c008e421a5fd6e322d3fc39003 /source/blender/editors/object | |
parent | 7bbf4f660507b95711ccd67bdc36bc5e1ee8c26f (diff) |
* Restored vertex parent
The operator was already there and written, just didn't have a hotkey
assigned. Gave it an icky popup menu like object mode parent until we
get a nice non-blocking report viewer.
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index eb2086fe95d..a1889b97169 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -330,6 +330,8 @@ void ED_keymap_object(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "LATTICE_OT_select_all", AKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "OBJECT_OT_vertex_parent_set", PKEY, KM_PRESS, KM_CTRL, 0); + /* menus */ WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL, 0); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 237498f15fd..95fbcdd4223 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -251,6 +251,7 @@ void OBJECT_OT_vertex_parent_set(wmOperatorType *ot) ot->idname= "OBJECT_OT_vertex_parent_set"; /* api callbacks */ + ot->invoke= WM_operator_confirm; ot->poll= vertex_parent_set_poll; ot->exec= vertex_parent_set_exec; |