Shift-A adds Armature Object (in Object Mode) or Bone (in Edit Mode) again. Still...

diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c
index cccec052aa6eeff9ed77d9a630948c5a556683d9..7902f9328589dbf7e7c1b663111b5bfa8447ac39 100644 (file)
--- a/source/blender/editors/armature/armature_ops.c
+++ b/source/blender/editors/armature/armature_ops.c
@@ -156,7 +156,8 @@ void ED_keymap_armature(wmWindowManager *wm)
        
        WM_keymap_add_item(keymap, "ARMATURE_OT_switch_direction", FKEY, KM_PRESS, KM_ALT, 0);
        
-               /* only menu is registered in keymaps for now */
+       WM_keymap_add_item(keymap, "ARMATURE_OT_bone_primitive_add", AKEY, KM_PRESS, KM_SHIFT, 0);
+               /* only the menu-version of subdivide is registered in keymaps for now */
        WM_keymap_add_item(keymap, "ARMATURE_OT_subdivs", SKEY, KM_PRESS, KM_ALT, 0);
        
        WM_keymap_add_item(keymap, "ARMATURE_OT_set_parent", PKEY, KM_PRESS, KM_CTRL, 0);

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 2a7e87aa4edd4e807edce3f51c27be4175fd565c..e0acb719cf65512f7ac52742f5ac3ca828ae5c56 100644 (file)
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -632,7 +632,7 @@ static int object_add_primitive_invoke(bContext *C, wmOperator *op, wmEvent *eve
        uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_CAMERA);
        uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_LAMP);
        uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_EMPTY);
-       uiMenuItemEnumO(head, "", 0, "OBJECT_OT_armature_add", "type", OB_ARMATURE);
+       uiMenuItemO(head, 0, "OBJECT_OT_armature_add");
        uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_LATTICE);
        
        uiPupMenuEnd(C, head);

diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index e1673cd1bbc18ea25dc457a25250d5dc052ce7b7..138f278fe770109db994eeff5076c46819dfd833 100644 (file)
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -71,6 +71,7 @@ void OBJECT_OT_mesh_add(struct wmOperatorType *ot);
 void OBJECT_OT_curve_add(struct wmOperatorType *ot);
 void OBJECT_OT_surface_add(struct wmOperatorType *ot);
 void OBJECT_OT_text_add(struct wmOperatorType *ot);
+void OBJECT_OT_armature_add(struct wmOperatorType *ot);
        /* only used as menu */
 void OBJECT_OT_primitive_add(struct wmOperatorType *ot);
 

diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index b2fd0bc348128b151bd4ce82c3c72ed0ae2d7209..134c486bb66431a38a2c90075bb05cc9518ae6e1 100644 (file)
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -95,6 +95,7 @@ void ED_operatortypes_object(void)
        WM_operatortype_append(OBJECT_OT_curve_add);
        WM_operatortype_append(OBJECT_OT_text_add);
        WM_operatortype_append(OBJECT_OT_surface_add);
+       WM_operatortype_append(OBJECT_OT_armature_add);
        WM_operatortype_append(OBJECT_OT_object_add);
        WM_operatortype_append(OBJECT_OT_primitive_add);
 }