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

[Julian Eisel]

Commit: a99495d2914088174ce0900b9360660a41d74c42
Author: Julian Eisel
Date:   Thu Mar 2 19:15:32 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBa99495d2914088174ce0900b9360660a41d74c42

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/scene.c

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



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

diff --cc source/blender/editors/interface/interface_templates.c
index 99d21064a4,62f12cd796..f363623682
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@@ -438,12 -426,11 +438,12 @@@ static void template_ID
  
  		if ((idfrom && idfrom->lib) || !editable)
  			UI_but_flag_enable(but, UI_BUT_DISABLED);
 -		
 -		uiLayoutRow(layout, true);
 +		if (use_big_size) {
 +			uiLayoutRow(layout, true);
 +		}
  	}
  	else if (flag & UI_ID_BROWSE) {
- 		but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X * 1.6, UI_UNIT_Y,
+ 		but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X * 1.5, UI_UNIT_Y,
  		                     TIP_(template_id_browse_tip(type)));
  		ui_def_but_icon(but, RNA_struct_ui_icon(type), UI_HAS_ICON);
  		/* default dragging of icon for id browse buttons */