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:
authorCampbell Barton <ideasman42@gmail.com>2018-06-30 14:52:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-30 14:52:04 +0300
commiteb63b32deea5772a5947cb6b77d2a89b1d22e6d1 (patch)
tree81f6754a8424058d4d97713d2e674dd3a403700f /source/blender/editors/screen
parent41176cd3d820649488ec5a5475d5dc7e97a01a59 (diff)
parentbdc1108e8cd8bf51e95de72d10862b4466dac8ca (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_user_menu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_user_menu.c b/source/blender/editors/screen/screen_user_menu.c
index f36bceaa129..382f6cac474 100644
--- a/source/blender/editors/screen/screen_user_menu.c
+++ b/source/blender/editors/screen/screen_user_menu.c
@@ -172,8 +172,7 @@ static void screen_user_menu_draw(const bContext *C, Menu *menu)
}
else if (umi->type == USER_MENU_TYPE_MENU) {
bUserMenuItem_Menu *umi_mt = (bUserMenuItem_Menu *)umi;
- uiItemM(
- menu->layout, NULL, umi_mt->mt_idname, umi->ui_name[0] ? umi->ui_name : NULL,
+ uiItemM(menu->layout, umi_mt->mt_idname, umi->ui_name[0] ? umi->ui_name : NULL,
ICON_NONE);
}
else if (umi->type == USER_MENU_TYPE_SEP) {