[Bf-blender-cvs] [c3810c5] master: Use PKey for edit-armature separate

[Campbell Barton]

Commit: c3810c596e91c2dd3729bc827a54796ebd10d9c9
Author: Campbell Barton
Date:   Wed May 27 09:53:03 2015 +1000
Branches: master
https://developer.blender.org/rBc3810c596e91c2dd3729bc827a54796ebd10d9c9

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).

===================================================================

M       source/blender/editors/armature/armature_ops.c
M       source/blender/editors/armature/armature_relations.c
M       source/blender/editors/curve/editcurve.c

===================================================================

diff --git a/source/blender/editors/armature/armature_ops.c 
b/source/blender/editors/armature/armature_ops.c
index 61c9dfb..ea435e3 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 cee3425..058a9a5 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 d4fb3d4..4c7a01d 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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs