[Bf-blender-cvs] [6a5bc88abfb] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 6a5bc88abfbbf4330ba0f1c4ea0b0366c42af3e1
Author: Campbell Barton
Date:   Fri Aug 24 12:17:33 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB6a5bc88abfbbf4330ba0f1c4ea0b0366c42af3e1

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/interface/interface_layout.c
index a9703736916,edd568e4fea..70bcc8e7c4e
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@@ -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]) {