Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-07-30 16:00:51 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-07-30 16:01:48 +0300
commit27567a6c760be523b77e4d95e544c60b6f9ddf84 (patch)
tree85ba3edf788e6ef345cf3290d8748d8fa9fd4320
parent4473427d8175d68a97e8b803266b3751175f183f (diff)
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...
-rw-r--r--source/blender/blenloader/intern/versioning_280.c3
1 files changed, 3 insertions, 0 deletions
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);
}
}