[Bf-blender-cvs] [6f54ce516d6] workspaces: Re-order for versioning

Campbell Barton noreply at git.blender.org
Mon May 1 18:01:27 CEST 2017


Commit: 6f54ce516d6622d222e4260610a37e720ef9e203
Author: Campbell Barton
Date:   Tue May 2 02:06:54 2017 +1000
Branches: workspaces
https://developer.blender.org/rB6f54ce516d6622d222e4260610a37e720ef9e203

Re-order for versioning

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

M	source/blender/blenloader/intern/versioning_280.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 6710fda39f8..14ad2ee2282 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -245,6 +245,14 @@ void do_versions_after_linking_280(Main *main)
 		}
 	}
 
+	if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
+		IDPropertyTemplate val = {0};
+		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+			scene->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
+			BKE_layer_collection_engine_settings_create(scene->collection_properties);
+		}
+	}
+
 	{
 		/* New workspace design */
 		if (!MAIN_VERSION_ATLEAST(main, 280, 1)) {
@@ -288,14 +296,6 @@ void do_versions_after_linking_280(Main *main)
 			BKE_workspace_iter_end;
 		}
 	}
-
-	if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
-		IDPropertyTemplate val = {0};
-		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
-			scene->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
-			BKE_layer_collection_engine_settings_create(scene->collection_properties);
-		}
-	}
 }
 
 static void do_version_layer_collections_idproperties(ListBase *lb)




More information about the Bf-blender-cvs mailing list