diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-05-04 16:27:31 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-05-04 16:33:02 +0300 |
| commit | 94a064c0e95871cd23fd6208f56f4e016a418327 (patch) | |
| tree | b8977c1f69af1c16502755d39102e4c2e228eec1 /source/blender/editors/screen/workspace_edit.c | |
| parent | aa8e3e6fbe4af697622def5fc7931ba54f6bbb4e (diff) | |
Fix T64045: Crash activating fullscreen workspace
See d83a72ec104ce9.
Diffstat (limited to 'source/blender/editors/screen/workspace_edit.c')
| -rw-r--r-- | source/blender/editors/screen/workspace_edit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index 6294a64af0f..2dfa05cf6b0 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -165,7 +165,9 @@ bool ED_workspace_change(WorkSpace *workspace_new, bContext *C, wmWindowManager } screen_new = screen_change_prepare(screen_old, screen_new, bmain, C, win); - BLI_assert(BKE_workspace_layout_screen_get(layout_new) == screen_new); + if (BKE_workspace_layout_screen_get(layout_new) != screen_new) { + layout_new = BKE_workspace_layout_find(workspace_new, screen_new); + } if (screen_new == NULL) { return false; |