[Bf-blender-cvs] [638a0410d10] workspaces: Merge branch 'blender2.8' into workspaces

[Julian Eisel]

Commit: 638a0410d1049508a88e7990bdbd688323d464c9
Author: Julian Eisel
Date:   Fri May 5 21:38:38 2017 +0200
Branches: workspaces
https://developer.blender.org/rB638a0410d1049508a88e7990bdbd688323d464c9

Merge branch 'blender2.8' into workspaces

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

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index f59be2c898a,bd2180c28a2..3e34a2ca7d0
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -6431,9 -6323,12 +6440,14 @@@ 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);
+ 
+ 	sce->layer_properties = newdataadr(fd, sce->layer_properties);
+ 	IDP_DirectLinkGroup_OrFree(&sce->layer_properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+ 
  	BKE_layer_collection_engine_settings_validate_scene(sce);
+ 	BKE_scene_layer_engine_settings_validate_scene(sce);
 +
 +	direct_link_scene_update_screen_data(fd, &bmain->workspaces, &bmain->screen);
  }
  
  /* ************ READ WM ***************** */
@@@ -6514,11 -6403,8 +6528,12 @@@ static void lib_link_windowmanager(File
  	
  	for (wm = main->wm.first; wm; wm = wm->id.next) {
  		if (wm->id.tag & LIB_TAG_NEED_LINK) {
+ 			/* Note: WM IDProperties are never written to file, hence no need to read/link them here. */
  			for (win = wm->windows.first; win; win = win->next) {
 +				/* Note: WM IDProperties are never written to file, hence no need to read/link them here. */
 +				win->scene = newlibadr(fd, wm->id.lib, win->scene);
 +				lib_link_workspace_instance_hook(fd, win->workspace_hook, &wm->id);
 +				/* deprecated, but needed for versioning (will be NULL'ed then) */
  				win->screen = newlibadr(fd, NULL, win->screen);
  			}
  			
diff --cc source/blender/blenloader/intern/versioning_280.c
index 6a28132f460,0c872c8a081..964394c39d1
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -371,10 -255,13 +371,20 @@@ void blo_do_versions_280(FileData *fd, 
  		}
  	}
  
+ 	if (!DNA_struct_elem_find(fd->filesdna, "SceneLayer", "IDProperty", "properties")) {
+ 		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 			for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
+ 				IDPropertyTemplate val = {0};
+ 				sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
+ 				BKE_scene_layer_engine_settings_create(sl->properties);
+ 			}
+ 		}
+ 	}
++
 +	{
 +		/* New workspace design */
 +		if (!DNA_struct_find(fd->filesdna, "WorkSpace")) {
 +			do_version_workspaces_before_lib_link(main);
 +		}
 +	}
  }