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:
-rw-r--r--release/scripts/modules/bpy_types.py2
-rw-r--r--source/blender/editors/interface/interface_layout.c10
2 files changed, 7 insertions, 5 deletions
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index 0b9893cea51..031d079e5dc 100644
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -760,9 +760,7 @@ class Menu(StructRNA, _GenericUI, metaclass=RNAMeta):
if context.area.show_menus:
cls.draw_menus(layout, context)
else:
- layout.separator()
layout.menu(cls.__name__, icon='COLLAPSEMENU')
- layout.separator()
class Region(StructRNA):
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 34c124b293e..d2099334efb 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1619,10 +1619,14 @@ static void ui_item_menu(uiLayout *layout, const char *name, int icon, uiMenuCre
h = UI_UNIT_Y;
if (layout->root->type == UI_LAYOUT_HEADER) { /* ugly .. */
- if (force_menu)
+ if (force_menu) {
w += UI_UNIT_Y;
- else
- w -= UI_UNIT_Y / 2;
+ }
+ else {
+ if (name[0]) {
+ w -= UI_UNIT_Y / 2;
+ }
+ }
}
if (name[0] && icon)