diff options
author | Julian Eisel <julian@blender.org> | 2020-05-26 13:11:04 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-05-26 13:19:27 +0300 |
commit | fc2bb44e9471e74c3545d900e79a532352fe0def (patch) | |
tree | 6db3917cb9a82d6b82027818584ff7b3dd748746 /source/blender | |
parent | 5a1ab3e9aeb310af8ce94af2eba0c648d19937cb (diff) |
Fix T68209: Crash opening pre 2.8 file with maximized area
Versioning for workspaces didn't update the map used to determine which
layout is active for a workspace in a specific window. Library code now
called the function to make a workspace active (even if it already was
active), which would also use this map to determine the active layout --
the wrong one.
Error in initial workspace integration, but only uncovered recently.
Likely through 0d8a8ce03b99.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 2d44da3c737..6c2098f06cf 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -256,7 +256,7 @@ static void do_version_workspaces_after_lib_link(Main *bmain) win->workspace_hook = BKE_workspace_instance_hook_create(bmain); BKE_workspace_active_set(win->workspace_hook, workspace); - BKE_workspace_active_layout_set(win->workspace_hook, layout); + BKE_workspace_hook_layout_for_workspace_set(win->workspace_hook, workspace, layout); /* Move scene and view layer to window. */ Scene *scene = screen->scene; |