From 867f96c23419269452488ecf80f908c57a84f935 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Mon, 9 Apr 2018 13:11:24 +0200 Subject: Fix crash and invalid context when changing workspace Caused by 1c24c04e6023f2d2a3. --- source/blender/editors/screen/workspace_edit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/screen/workspace_edit.c') diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index dee62f9c5dd..fbfb88ce6c1 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -193,7 +193,9 @@ bool ED_workspace_change( WM_window_set_active_layout(win, workspace_new, layout_new); WM_window_set_active_workspace(win, workspace_new); - /* update screen *after* changing workspace - which also causes the actual screen change */ + /* update screen *after* changing workspace - which also causes the + * actual screen change and updates context (including CTX_wm_workspace) */ + screen_change_update(C, win, screen_new); workspace_change_update(workspace_new, workspace_old, C, wm); BLI_assert(BKE_workspace_view_layer_get(workspace_new, CTX_data_scene(C)) != NULL); -- cgit v1.2.3