[Bf-blender-cvs] [33ab40504d0] workspaces: Merge branch 'blender2.8' into workspaces

[Julian Eisel]

Commit: 33ab40504d0cc3c67c23af6d50059d53091e50f4
Author: Julian Eisel
Date:   Fri May 5 13:20:41 2017 +0200
Branches: workspaces
https://developer.blender.org/rB33ab40504d0cc3c67c23af6d50059d53091e50f4

Merge branch 'blender2.8' into workspaces

Conflicts:
	source/blender/blenloader/intern/readfile.c

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 2c2b2c1ba28,9a85587e2e0..f59be2c898a
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -6430,9 -6314,7 +6431,9 @@@ static void direct_link_scene(FileData 
  
  	sce->collection_properties = newdataadr(fd, sce->collection_properties);
  	IDP_DirectLinkGroup_OrFree(&sce->collection_properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
- 	BKE_layer_collection_engine_settings_validate(sce);
+ 	BKE_layer_collection_engine_settings_validate_scene(sce);
 +
 +	direct_link_scene_update_screen_data(fd, &bmain->workspaces, &bmain->screen);
  }
  
  /* ************ READ WM ***************** */
diff --cc source/blender/editors/interface/interface_templates.c
index e5745fee1aa,e3a71feb1a9..189b26882cf
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@@ -511,14 -464,9 +511,9 @@@ static void template_ID
  
  		//text_idbutton(id, name);
  		name[0] = '\0';
 -		but = uiDefButR(block, UI_BTYPE_TEXT, 0, name, 0, 0, UI_UNIT_X * 6, UI_UNIT_Y,
 -		                &idptr, "name", -1, 0, 0, -1, -1, RNA_struct_ui_description(type));
 +		but = uiDefButR_prop(block, UI_BTYPE_TEXT, 0, name, 0, 0, UI_UNIT_X * 6, UI_UNIT_Y,
 +		                     &idptr, prop, -1, 0, 0, -1, -1, RNA_struct_ui_description(type));
  		UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_RENAME));
- 
- 		but->search_func = id_search_cb;
- 		but->search_arg = template;
- 		ui_but_search_refresh(but, true);
- 
  		if (user_alert) UI_but_flag_enable(but, UI_BUT_REDALERT);
  
  		if (id->lib) {