diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-12-19 21:56:08 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-12-19 21:56:08 +0300 |
| commit | 72d805f17d5e7732cf37c70c1ae732efd5d509c2 (patch) | |
| tree | 69640121e30ca61b5c120a146c8f397a17839ae8 /source/blender/src/header_info.c | |
| parent | 75a227e62009d8fb29f5bd7984ce82dcc4e68797 (diff) | |
| parent | c1a2851c0d791f3e041ec6d33747cd056919b6ad (diff) | |
Orange: monday merger with bf-blender (loadsa bugfixes).
ALso: a bit tidying up in editaction.c and python Object.c
Diffstat (limited to 'source/blender/src/header_info.c')
| -rw-r--r-- | source/blender/src/header_info.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index dbb32bf9358..b4e8a19d94d 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -1204,10 +1204,6 @@ void do_info_addmenu(void *arg, int event) /* Camera */ add_object_draw(OB_CAMERA); break; - case 7: - /* Lamp */ - // add_object_draw(OB_LAMP); - break; case 8: /* Armature */ add_primitiveArmature(OB_ARMATURE); @@ -1245,13 +1241,11 @@ static uiBlock *info_addmenu(void *arg_unused) 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, ""); uiDefIconTextBlockBut(block, info_add_lampmenu, NULL, ICON_RIGHTARROW_THIN, "Lamp", 0, yco-=20, 120, 19, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, ""); - /* 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, "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); |