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-08-24 05:17:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-08-24 05:17:33 +0300
commit6a5bc88abfbbf4330ba0f1c4ea0b0366c42af3e1 (patch)
treed02506a6dd8d6f82a7509e509cb3d58d90195ec9
parent7fa42b3e519173c29a2ae250cea15f35e32521c2 (diff)
parentb2d32d7fa4b371561b18c68eeeed0d7012850f8c (diff)
Merge branch 'master' into blender2.8
-rw-r--r--source/blender/editors/interface/interface_layout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index a9703736916..70bcc8e7c4e 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -748,7 +748,8 @@ static uiBut *ui_item_with_label(
int prop_but_width = w_hint;
const bool use_prop_sep = ((layout->item.flag & UI_ITEM_PROP_SEP) != 0);
- sub = uiLayoutRow(layout, layout->align);
+ /* Always align item with label since text is already given enough space not to overlap. */
+ sub = uiLayoutRow(layout, true);
UI_block_layout_set_current(block, sub);
if (name[0]) {