merge trunk 17122:17213

[blender-staging.git] / source / blender / src / header_view3d.c

diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index e2caf97df051342d8224b01d6a7e38a08a8c7dad..b51c3e620e5315223c78446473c2f25f7862144c 100644 (file)
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -3978,6 +3978,9 @@ static void do_view3d_edit_armaturemenu(void *arg, int event)
        case 22: /* separate */
                separate_armature();
                break;
+       case 23: /* bone sketching panel */
+               add_blockhandler(curarea, VIEW3D_HANDLER_BONESKETCH, UI_PNL_UNSTOW);
+               break;
        }
        
        allqueue(REDRAWVIEW3D, 0);
@@ -4055,6 +4058,7 @@ static uiBlock *view3d_edit_armaturemenu(void *arg_unused)
        uiDefBut(block, SEPR, 0, "",                            0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
        
        uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Transform Properties|N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+       uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Bone Sketching|P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 23, "");
        uiDefIconTextBlockBut(block, view3d_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, "");
        uiDefIconTextBlockBut(block, view3d_edit_mirrormenu, NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, menuwidth, 19, "");
        uiDefIconTextBlockBut(block, view3d_edit_snapmenu, NULL, ICON_RIGHTARROW_THIN, "Snap", 0, yco-=20, 120, 19, "");