[Bf-blender-cvs] [e9cf3fae8e2] blender2.8: Fixup for workspace view_layer fix

Dalai Felinto noreply at git.blender.org
Fri Dec 1 18:29:12 CET 2017


Commit: e9cf3fae8e2b5c419bdafcbe312483ce0c38552e
Author: Dalai Felinto
Date:   Fri Dec 1 15:26:46 2017 -0200
Branches: blender2.8
https://developer.blender.org/rBe9cf3fae8e2b5c419bdafcbe312483ce0c38552e

Fixup for workspace view_layer fix

We do not assume subversion bump until we actually change the subversion.

For example, a branch may have bumped its subversion to 3, yet still require
the new doversion code introduced on 108c4bd5026.

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

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 c718702388a..f500e64d3f9 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -549,7 +549,7 @@ void do_versions_after_linking_280(Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 280, 3)) {
+	{
 		for (WorkSpace *workspace = main->workspaces.first; workspace; workspace = workspace->id.next) {
 			if (workspace->view_layer) {
 				/* During 2.8 work we temporarly stored view-layer in the



More information about the Bf-blender-cvs mailing list