diff options
| author | Ton Roosendaal <ton@blender.org> | 2003-11-06 19:35:15 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2003-11-06 19:35:15 +0300 |
| commit | 94c6fae700baf696d0aea51cb08579dcb45b2117 (patch) | |
| tree | a8a75bc7b2a50eb8df847bdb63eb40cc89c1c9ac /source | |
| parent | fa6a1bc5fe7b61b88dc06c8593364f5fb9d44262 (diff) | |
- fixed order in addmenu pulldown
- added 'add bones' for in editmode armatures in toolbox
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/header_info.c | 15 | ||||
| -rw-r--r-- | source/blender/src/toolbox.c | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index 76181277901..5e3ee10f51f 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -1172,16 +1172,15 @@ static uiBlock *info_addmenu(void *arg_unused) uiDefIconTextBlockBut(block, info_add_curvemenu, NULL, ICON_RIGHTARROW_THIN, "Curve", 0, yco-=20, 120, 19, ""); uiDefIconTextBlockBut(block, info_add_surfacemenu, NULL, ICON_RIGHTARROW_THIN, "Surface", 0, yco-=20, 120, 19, ""); uiDefIconTextBlockBut(block, info_add_metamenu, NULL, ICON_RIGHTARROW_THIN, "Meta", 0, yco-=20, 120, 19, ""); - + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Text", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 4, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Empty", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 5, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lattice|", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 9, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Text|", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 4, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Empty|", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 5, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Camera", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 6, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lamp", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 7, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, ""); -// uiDefBut(block, BUTM, 1, "Armature|", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 8, "Adds an Armature"); -// uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Camera|", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 6, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lamp|", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 7, ""); + /* armature needs 3d window to draw */ + //uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Armature", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 8, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lattice", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 9, ""); uiBlockSetDirection(block, UI_DOWN); uiTextBoundsBlock(block, 80); diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index e476ee1f1c2..73d6a25a082 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -1873,6 +1873,10 @@ static TBitem addmenu_meta[]= { { 0, "Meta Cube", 4, NULL}, { -1, "", 0, do_info_add_metamenu}}; +static TBitem addmenu_armature[]= { +{ 0, "Bones", 8, NULL}, +{ -1, "", 0, do_info_addmenu}}; + static TBitem tb_add[]= { { 0, "Mesh", 0, addmenu_mesh}, @@ -2005,7 +2009,7 @@ void toolbox_n(void) } else if(G.obedit->type==OB_ARMATURE) { menu1= tb_obdata;str1= "Armature"; - menu2= tb_empty; + menu2= addmenu_armature; menu3= tb__select; menu4= tb_edit; menu5= tb_transform_editmode2; |