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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-12-28 13:28:58 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-12-28 13:36:14 +0300
commit37001920431633490b743ee4ebd814f4d043b78e (patch)
tree45fce353437989c632461f64e81ba10cb4663cfb /source/blender
parentc07ae0e821e441b3c3a9b6f192487744c54f4015 (diff)
Fix T59910: material editor UI issue after recent changes.
This reverts part of commit 4f98266cf6, ref D4123.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/interface/interface_layout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index eb1b86559bf..87927ef7643 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -285,8 +285,8 @@ static int ui_text_icon_width(uiLayout *layout, const char *name, int icon, bool
bool variable;
const int unit_x = UI_UNIT_X * (layout->scale[0] ? layout->scale[0] : 1.0f);
- if (!name[0])
- return unit_x; /* icon only or empty name */
+ if (icon && !name[0])
+ return unit_x; /* icon only */
variable = ui_layout_variable_size(layout);