[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18691] branches/blender2.5/blender/source /blender/editors/interface/interface_regions.c: 2.5

[Ton Roosendaal]

Revision: 18691
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18691
Author:   ton
Date:     2009-01-27 09:36:09 +0100 (Tue, 27 Jan 2009)

Log Message:
-----------
2.5

Fix: icons didnt show for uiMenu api.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-01-27 08:17:35 UTC (rev 18690)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-01-27 08:36:09 UTC (rev 18691)
@@ -2202,7 +2202,7 @@
 			name= ui_menu_enumpropname(opptr, item->propname, item->retval);
 			BLI_strncpy(bname, name, 64);
 			
-			but= uiDefIconTextBut(block, BUTM, item->retval, ICON_BLANK1, bname, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, NULL, 0.0, 0.0, 0, 0, "");
+			but= uiDefIconTextBut(block, BUTM, item->retval, item->icon, bname, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, NULL, 0.0, 0.0, 0, 0, "");
 			
 			but->opptr= opptr;
 			but->opname= item->opname;
@@ -2211,7 +2211,7 @@
 			y1 -= MENU_BUTTON_HEIGHT;
 		}
 		else if(item->type==MENU_ITEM_OPNAME) {
-			uiDefIconTextButO(block, BUTM, item->opname, head->opcontext, ICON_BLANK1, NULL, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, NULL);
+			uiDefIconTextButO(block, BUTM, item->opname, head->opcontext, item->icon, NULL, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, NULL);
 			y1 -= MENU_BUTTON_HEIGHT;
 		}
 		else {