[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20003] branches/blender2.5/blender/source /blender/editors/object/object_edit.c: 2.5 - Icons Add Object Menu

[Joshua Leung]

Revision: 20003
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20003
Author:   aligorith
Date:     2009-04-30 12:22:28 +0200 (Thu, 30 Apr 2009)

Log Message:
-----------
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)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/object_edit.c

Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-04-30 10:18:50 UTC (rev 20002)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-04-30 10:22:28 UTC (rev 20003)
@@ -637,16 +637,16 @@
 	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);