Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
-rw-r--r--source/blender/editors/interface/interface_regions.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 7830ec0e707..ad372077351 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1835,8 +1835,13 @@ static uiBlock *ui_block_func_MENU_ITEM(bContext *C, uiPopupBlockHandle *handle,
else if(item->type==MENU_ITEM_OPNAME_ENUM) {
const char *name;
char bname[64];
-
- name= ui_menu_enumpropname(item->opname, item->propname, item->enumval);
+
+ /* If no name is given, use the enum name */
+ if (item->name[0] == '\0')
+ name= ui_menu_enumpropname(item->opname, item->propname, item->enumval);
+ else
+ name= item->name;
+
BLI_strncpy(bname, name, sizeof(bname));
but= uiDefIconTextButO(block, BUTM, item->opname, item->opcontext, item->icon, bname, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, "");