From 52c356c1998f0eea7e45ef53c4bf3c1e36eff9ef Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 25 May 2020 17:49:58 +0200 Subject: Cleanup wrong format specifier in a debug printf. --- source/blender/blenloader/intern/readfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 22862fc1d0d..5511a27eba9 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9638,7 +9638,7 @@ static bool read_libblock_undo_restore( } /* Restore local datablocks. */ - DEBUG_PRINTF("UNDO: read %s (uuid %d) -> ", id->name, id->session_uuid); + DEBUG_PRINTF("UNDO: read %s (uuid %u) -> ", id->name, id->session_uuid); ID *id_old = NULL; const bool do_partial_undo = (fd->skip_flags & BLO_READ_SKIP_UNDO_OLD_MAIN) == 0; -- cgit v1.2.3 From fc2bb44e9471e74c3545d900e79a532352fe0def Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Tue, 26 May 2020 12:11:04 +0200 Subject: 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. --- source/blender/blenloader/intern/versioning_280.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenloader') 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; -- cgit v1.2.3