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:
authorSybren A. Stüvel <sybren@stuvel.eu>2018-06-06 12:13:05 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2018-06-06 12:13:11 +0300
commit03b8e4f6087ad5301557fda1b66e2e370731dae4 (patch)
tree21f3b298346d7061bbb2dd616edd67bc013f7fb8
parent23db3a5ade3c4201e0f9ef84a8605d87789a18f3 (diff)
Fix importing temporary screens
Apparently Blender 2.79 could save temporary screens; those should not be converted to workspaces.
-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 b4f0b2ddfd2..57d36dede70 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -97,6 +97,9 @@ static void do_version_workspaces_create_from_screens(Main *bmain)
Scene *scene = screen->scene;
WorkSpace *workspace;
ViewLayer *layer = BLI_findlink(&scene->view_layers, scene->r.actlay);
+ if (screen->temp) {
+ continue;
+ }
if (!layer) {
layer = BKE_view_layer_default_view(scene);
}