diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2018-04-22 20:58:27 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2018-04-23 00:23:20 +0300 |
commit | 9db492de6dd07dca93f0de7dbfa92f811fe50765 (patch) | |
tree | f7050e660a9d6deedfe6873875d042c90fa5cea2 /source/blender/blenloader/intern/versioning_250.c | |
parent | 9eaf00616ba60df92cfab2837dd175b8e7eb4c44 (diff) |
Cleanup: Get rid of ScrArea.butspacetype syncing with ScrArea.spacetype
The only real reason we need `butspacetype` is while switching areas, where we
need to delay the actual switch to the RNA _update callback since only there we
can access context.
So instead of trying to sync it with `spacetype`, only set while needed and
unset it afterwards (as in set to `SPACE_EMPTY`).
This should also allow us to re-use `butspacetype` in versioning code when
trying to read removed editors. It'll store the space type value of the removed
editor which we can then use on versioning.
For backwards compatibility, we store `butspacetype` with the value of
`spacetype`.
Diffstat (limited to 'source/blender/blenloader/intern/versioning_250.c')
-rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 2610f57f124..780abb693a3 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -429,9 +429,6 @@ static void do_versions_windowmanager_2_50(bScreen *screen) sl->spacetype = SPACE_EMPTY; /* spacedata then matches */ } - /* it seems to be possible in 2.5 to have this saved, filewindow probably */ - sa->butspacetype = sa->spacetype; - /* pushed back spaces also need regions! */ if (sa->spacedata.first) { sl = sa->spacedata.first; |