diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-04-30 14:22:28 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-04-30 14:22:28 +0400 |
| commit | 4ff585569ce4d5e2c2feeba7d7c57ae5ea38c275 (patch) | |
| tree | 892abf21813b22089afdda4956b4811f83ddce01 /source/blender/editors | |
| parent | d8625fb93b0c1a26f700fa0bbb76bc5c04c50bc8 (diff) | |
2.5 - Icons Add Object Menu
A little experiment in putting icons on this menu as per a mockup from William.
However, it appears that there is a minor bug here though with the menu drawing code. I've deliberately left the Mesh entry without an icon for now to illustrate part of the problem (note the placement of the icons for curves and surfaces)
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 37b50da39b4..2ec9d1aed37 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -637,16 +637,16 @@ static int object_primitive_add_invoke(bContext *C, wmOperator *op, wmEvent *eve uiPopupMenu *pup= uiPupMenuBegin("Add Object", 0); uiLayout *layout= uiPupMenuLayout(pup); - uiItemMenuEnumO(layout, NULL, 0, "OBJECT_OT_mesh_add", "type"); - uiItemMenuEnumO(layout, NULL, 0, "OBJECT_OT_curve_add", "type"); - uiItemMenuEnumO(layout, NULL, 0, "OBJECT_OT_surface_add", "type"); - uiItemO(layout, NULL, 0, "OBJECT_OT_text_add"); - uiItemEnumO(layout, NULL, 0, "OBJECT_OT_object_add", "type", OB_MBALL); - uiItemEnumO(layout, NULL, 0, "OBJECT_OT_object_add", "type", OB_CAMERA); - uiItemEnumO(layout, NULL, 0, "OBJECT_OT_object_add", "type", OB_LAMP); - uiItemEnumO(layout, NULL, 0, "OBJECT_OT_object_add", "type", OB_EMPTY); - uiItemO(layout, NULL, 0, "OBJECT_OT_armature_add"); - uiItemEnumO(layout, NULL, 0, "OBJECT_OT_object_add", "type", OB_LATTICE); + uiItemMenuEnumO(layout, NULL, /*ICON_OUTLINER_OB_MESH*/0, "OBJECT_OT_mesh_add", "type"); + uiItemMenuEnumO(layout, NULL, ICON_OUTLINER_OB_CURVE, "OBJECT_OT_curve_add", "type"); + uiItemMenuEnumO(layout, NULL, ICON_OUTLINER_OB_SURFACE, "OBJECT_OT_surface_add", "type"); + uiItemO(layout, NULL, ICON_OUTLINER_OB_FONT, "OBJECT_OT_text_add"); + uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_META, "OBJECT_OT_object_add", "type", OB_MBALL); + uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_CAMERA, "OBJECT_OT_object_add", "type", OB_CAMERA); + uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_LAMP, "OBJECT_OT_object_add", "type", OB_LAMP); + uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_EMPTY, "OBJECT_OT_object_add", "type", OB_EMPTY); + uiItemO(layout, NULL, ICON_OUTLINER_OB_ARMATURE, "OBJECT_OT_armature_add"); + uiItemEnumO(layout, NULL, ICON_OUTLINER_OB_LATTICE, "OBJECT_OT_object_add", "type", OB_LATTICE); uiPupMenuEnd(C, pup); |