Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 24 Aug 2018 02:17:33 +0000 (12:17 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 24 Aug 2018 02:17:33 +0000 (12:17 +1000)
1  2 
source/blender/editors/interface/interface_layout.c

index a9703736916774444dd6d648329ae5d42b7feca8,edd568e4feaec95e60076786e456279267fbd298..70bcc8e7c4e8069719811f1b138d4e2b25e80b2e
@@@ -745,10 -676,10 +745,11 @@@ static uiBut *ui_item_with_label
        uiBut *but = NULL;
        PropertyType type;
        PropertySubType subtype;
 -      int labelw;
 +      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]) {