[Bf-blender-cvs] [5cb70a89e10] blender2.8: Fix failing assert when reading workspace list from workspaces.blend

Julian Eisel noreply at git.blender.org
Fri Dec 15 17:26:30 CET 2017


Commit: 5cb70a89e10a83eab689d1de1060c54b3cb3137d
Author: Julian Eisel
Date:   Fri Dec 15 17:24:10 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB5cb70a89e10a83eab689d1de1060c54b3cb3137d

Fix failing assert when reading workspace list from workspaces.blend

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

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 cfe7ffe87a2..944ddf1763d 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -562,7 +562,9 @@ void do_versions_after_linking_280(Main *main)
 					}
 				}
 			}
-			BLI_assert(workspace->view_layer == NULL);
+			/* While this should apply to most cases, it fails when reading workspaces.blend
+			 * to get its list of workspaces without actually appending any of them. */
+//			BLI_assert(workspace->view_layer == NULL);
 		}
 	}



More information about the Bf-blender-cvs mailing list