[Bf-blender-cvs] [7f842e5910a] workspaces: Merge branch 'blender2.8' into workspaces

[Campbell Barton]

Commit: 7f842e5910a143347851a20b8136c48715ba8756
Author: Campbell Barton
Date:   Tue Apr 4 13:24:35 2017 +1000
Branches: workspaces
https://developer.blender.org/rB7f842e5910a143347851a20b8136c48715ba8756

Merge branch 'blender2.8' into workspaces

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 90ab4653a1f,d416f4faae4..de062761c6f
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -318,12 -256,15 +337,22 @@@ void blo_do_versions_280(FileData *fd, 
  				ob->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
  			}
  		}
+ 
+ 		if (DNA_struct_elem_find(fd->filesdna, "LayerCollection", "ListBase", "engine_settings") &&
+ 		    !DNA_struct_elem_find(fd->filesdna, "LayerCollection", "IDProperty", "properties"))
+ 		{
+ 			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 				for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
+ 					do_version_layer_collections_idproperties(&sl->layer_collections);
+ 				}
+ 			}
+ 		}
  	}
 +
 +	{
 +		/* New workspace design */
 +		if (!DNA_struct_find(fd->filesdna, "WorkSpace")) {
 +			do_version_workspaces_before_lib_link(main);
 +		}
 +	}
  }