diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2019-09-20 16:09:47 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2019-09-20 16:18:25 +0300 |
commit | d1cc340e56691cb82e444289415ede24ba4d2bc0 (patch) | |
tree | fa4dd87f4855bd80a95d176c6c46f010a33c9231 /source/blender/blenloader | |
parent | 7a83b64f7bd39934cf73dcca94598b610e829fb4 (diff) |
Rewrite file region handling for non-editor mode
This makes it so that regions only needed when the file browser is
invoked as an operation (e.g. Ctrl+O rather than a regular editor) are
lazy created then, and removed if the file browser is changed into a
regular editor then (e.g. Ctrl+O over regular file browser editor ->
Cancel).
That should remove some troublesome assumptions and makes versioning
redundant.
It also fixes the issue of an empty execute region at the bottom after
cancelling a file operation invoked from a regular file browser editor.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index aa54e64cd6b..477a93f9858 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -3877,19 +3877,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } - else if (sl->spacetype == SPACE_FILE) { - ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase; - ARegion *ar_execute = do_versions_find_region_or_null(regionbase, RGN_TYPE_EXECUTE); - - if (!ar_execute) { - ARegion *ar_main = do_versions_find_region(regionbase, RGN_TYPE_WINDOW); - ar_execute = MEM_callocN(sizeof(ARegion), "versioning execute region for file"); - BLI_insertlinkbefore(regionbase, ar_main, ar_execute); - ar_execute->regiontype = RGN_TYPE_EXECUTE; - ar_execute->alignment = RGN_ALIGN_BOTTOM; - ar_execute->flag |= RGN_FLAG_DYNAMIC_SIZE; - } - } } } } |