diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-27 02:53:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-27 02:56:50 +0300 |
| commit | c3810c596e91c2dd3729bc827a54796ebd10d9c9 (patch) | |
| tree | 3a303cb97ba3696becde7afd06a3c1fae9e613a9 /source/blender | |
| parent | 84ad20acef4c0db91c9a850e81c7dc0a57aef42a (diff) | |
Use PKey for edit-armature separate
As used already for mesh & curves.
Add confirmation menu for curve & armature,
since this isn't such a common operation and undoing leaves object data
(long term bug/todo to fix).
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/armature/armature_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/armature/armature_relations.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 1 |
3 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 61c9dfb24fa..ea435e3e4fa 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -276,7 +276,7 @@ void ED_keymap_armature(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "ARMATURE_OT_merge", MKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "ARMATURE_OT_split", YKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ARMATURE_OT_separate", PKEY, KM_PRESS, KM_CTRL | KM_ALT, 0); + WM_keymap_add_item(keymap, "ARMATURE_OT_separate", PKEY, KM_PRESS, 0, 0); /* set flags */ WM_keymap_add_menu(keymap, "VIEW3D_MT_bone_options_toggle", WKEY, KM_PRESS, KM_SHIFT, 0); diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index cee34257b2c..058a9a5fd03 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -660,6 +660,7 @@ void ARMATURE_OT_separate(wmOperatorType *ot) ot->description = "Isolate selected bones into a separate armature"; /* callbacks */ + ot->invoke = WM_operator_confirm; ot->exec = separate_armature_exec; ot->poll = ED_operator_editarmature; diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index d4fb3d41d24..4c7a01dc291 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1538,6 +1538,7 @@ void CURVE_OT_separate(wmOperatorType *ot) ot->description = "Separate selected points from connected unselected points into a new object"; /* api callbacks */ + ot->invoke = WM_operator_confirm; ot->exec = separate_exec; ot->poll = ED_operator_editsurfcurve; |