2.5:

* RNA: enum items with "" indentifier are now interpreted as separators.
* Add Object menu: added consistent names, separators.

3 files changed, 19 insertions, 44 deletions

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index a76fdcbf39d..b84a3ab469c 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2123,7 +2123,9 @@ uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, char *str, short x1,
 				dynstr= BLI_dynstr_new();
 				BLI_dynstr_appendf(dynstr, "%s%%t", RNA_property_ui_name(prop));
 				for(i=0; i<totitem; i++) {
-					if(item[i].icon)
+					if(!item[i].identifier[0])
+						BLI_dynstr_appendf(dynstr, "|%l");
+					else if(item[i].icon)
 						BLI_dynstr_appendf(dynstr, "|%s %%i%d %%x%d", item[i].name, item[i].icon, item[i].value);
 					else
 						BLI_dynstr_appendf(dynstr, "|%s %%x%d", item[i].name, item[i].value);
@@ -2142,7 +2144,7 @@ uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, char *str, short x1,
 
 				RNA_property_enum_items(ptr, prop, &item, &totitem);
 				for(i=0; i<totitem; i++) {
-					if(item[i].value == (int)max) {
+					if(item[i].identifier[0] && item[i].value == (int)max) {
 						str= (char*)item[i].name;
 						icon= item[i].icon;
 					}
@@ -2165,7 +2167,7 @@ uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, char *str, short x1,
 				RNA_property_enum_items(ptr, prop, &item, &totitem);
 
 				for(i=0; i<totitem; i++) {
-					if(item[i].value == (int)max) {
+					if(item[i].identifier[0] && item[i].value == (int)max) {
 						if(item[i].description[0])
 							tip= (char*)item[i].description;
 						break;
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 0bf64f75552..bb6ca6c502f 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -439,6 +439,9 @@ static void ui_item_enum_row(uiLayout *layout, uiBlock *block, PointerRNA *ptr,
 
 	uiBlockSetCurLayout(block, ui_item_local_sublayout(layout, layout, 1));
 	for(a=0; a<totitem; a++) {
+		if(!item[a].identifier[0])
+			continue;
+
 		name= (!uiname || uiname[0])? (char*)item[a].name: "";
 		icon= item[a].icon;
 		value= item[a].value;
@@ -557,13 +560,11 @@ static char *ui_menu_enumpropname(char *opname, char *propname, int retval)
 	if(prop) {
 		const EnumPropertyItem *item;
 		int totitem, i;
+		char *name;
 
 		RNA_property_enum_items(&ptr, prop, &item, &totitem);
-
-		for (i=0; i<totitem; i++) {
-			if(item[i].value==retval)
-				return (char*)item[i].name;
-		}
+		if(RNA_enum_name(item, retval, &name))
+			return name;
 	}
 
 	return "";
@@ -603,7 +604,10 @@ void uiItemsEnumO(uiLayout *layout, char *opname, char *propname)
 		RNA_property_enum_items(&ptr, prop, &item, &totitem);
 
 		for(i=0; i<totitem; i++)
-			uiItemEnumO(layout, (char*)item[i].name, item[i].icon, opname, propname, item[i].value);
+			if(item[i].identifier[0])
+				uiItemEnumO(layout, (char*)item[i].name, item[i].icon, opname, propname, item[i].value);
+			else
+				uiItemS(layout);
 	}
 }
 
@@ -889,7 +893,10 @@ void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, char *propname)
 		RNA_property_enum_items(ptr, prop, &item, &totitem);
 
 		for(i=0; i<totitem; i++)
-			uiItemEnumR(layout, (char*)item[i].name, 0, ptr, propname, item[i].value);
+			if(item[i].identifier[0])
+				uiItemEnumR(layout, (char*)item[i].name, 0, ptr, propname, item[i].value);
+			else
+				uiItemS(layout);
 	}
 }
 
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 27fb0731d67..1b968508918 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -2438,40 +2438,6 @@ typedef struct uiMenuInfo {
 
 /************************ Menu Definitions to uiBlocks ***********************/
 
-const char *ui_menu_enumpropname(char *opname, const char *propname, int retval)
-{
-	wmOperatorType *ot= WM_operatortype_find(opname);
-	PointerRNA ptr;
-	PropertyRNA *prop;
-
-	if(!ot || !ot->srna)
-		return "";
-	
-	RNA_pointer_create(NULL, ot->srna, NULL, &ptr);
-	prop= RNA_struct_find_property(&ptr, propname);
-	
-	if(prop) {
-		const EnumPropertyItem *item;
-		int totitem, i;
-		
-		RNA_property_enum_items(&ptr, prop, &item, &totitem);
-		
-		for (i=0; i<totitem; i++) {
-			if(item[i].value==retval)
-				return item[i].name;
-		}
-	}
-
-	return "";
-}
-
-typedef struct MenuItemLevel {
-	int opcontext;
-	char *opname;
-	char *propname;
-	PointerRNA rnapoin;
-} MenuItemLevel;
-
 static uiBlock *ui_block_func_MENU_ITEM(bContext *C, uiPopupBlockHandle *handle, void *arg_info)
 {
 	uiBlock *block;