[Bf-blender-cvs] [27567a6c760] blender2.8: Fix T56020: Crash while opening .blend file made with older version.
Bastien Montagne
noreply at git.blender.org
Mon Jul 30 15:01:57 CEST 2018
Commit: 27567a6c760be523b77e4d95e544c60b6f9ddf84
Author: Bastien Montagne
Date: Mon Jul 30 15:00:51 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB27567a6c760be523b77e4d95e544c60b6f9ddf84
Fix T56020: Crash while opening .blend file made with older version.
We need a NULL workspace check here, in some cases we get a SRTemp
screen even though it's not tagged as temp...
===================================================================
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 39ceb527209..5b0a12a0b4c 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -112,6 +112,9 @@ static void do_version_workspaces_create_from_screens(Main *bmain)
else {
workspace = BKE_workspace_add(bmain, screen->id.name + 2);
}
+ if (workspace == NULL) {
+ continue; /* Not much we can do.. */
+ }
BKE_workspace_layout_add(bmain, workspace, screen, screen->id.name + 2);
}
}
More information about the Bf-blender-cvs
mailing list