diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-09-30 15:49:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-10-02 12:47:34 +0300 |
| commit | 6219d0d145d3f2e6bd30be1c91e952e18db44e74 (patch) | |
| tree | bef402396e0076094364277403922709f8fc60ce /source/blender/editors/screen/workspace_edit.c | |
| parent | d74d35e39eaf97a63178c84a6c4e9ab4e0bc384c (diff) | |
Fix (unreported) design flow in how workspace's relation data are read from .blend file.
Relying on pointer addresses across different data-blocks is extremely
not recommended (and should be strictly forbidden ideally), in
particular in direct_link step of blend file reading.
- It assumes a specific order in reading of data, which is not ensured
in future, and is in any case a very bad, non explicit, hidden
dependency on behaviors of other parts of the codebase.
- It is intrinsically unsafe (as in, it makes writing bad code and making
mistakes easy, see e.g. fix in rB84b3f6e049b35f9).
- It makes advanced handling of data-blocks harder (thinking about
partial undo code e.g., even though in this specific case it was not
an issue as we do not re-read neither windowmanagers nor worspaces
during undo).
New code uses windows' `winid` instead as 'anchor' to find again proper
workspace hook in windows at read time.
As a bonus, it will also cleanup the list of relations from any invalid
ones (afaict it was never done previously).
Differential Revision: https://developer.blender.org/D9073
Diffstat (limited to 'source/blender/editors/screen/workspace_edit.c')
| -rw-r--r-- | source/blender/editors/screen/workspace_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index 702c824077d..aca2b48a937 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -141,7 +141,7 @@ bool ED_workspace_change(WorkSpace *workspace_new, bContext *C, wmWindowManager return false; } - BKE_workspace_active_layout_set(win->workspace_hook, workspace_new, layout_new); + BKE_workspace_active_layout_set(win->workspace_hook, win->winid, workspace_new, layout_new); BKE_workspace_active_set(win->workspace_hook, workspace_new); /* update screen *after* changing workspace - which also causes the |