blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix crash opening maximized File Browser from Asset Browser 

If Preferences > Interface > Temporary Editors > File Browser is set to
"Maximized Area", opening a File Browser from an Asset Browser would
cause the new maximized editor to be an Asset Browser. Exiting it again
would crash.

This fixes the wrong behavior and the crash. There's still an issue with
exiting the editor again, it stays a File Browser then and doesn't go
back to being an Asset Browser. That's to be fixed separately.
This commit is contained in:
Julian Eisel 2020-12-15 18:49:56 +01:00
parent b24712a9ca
commit ffe63b0440
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/screen/screen_edit.c
View File

@ -1369,6 +1369,7 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *area, const
newa->full = oldscreen;
ED_screen_change(C, screen);
ED_area_tag_refresh(newa);
}
/* XXX bad code: setscreen() ends with first area active. fullscreen render assumes this too */

2
source/blender/editors/space_file/filesel.c
View File

@ -490,7 +490,7 @@ void ED_fileselect_set_params_from_userdef(SpaceFile *sfile)
wmOperator *op = sfile->op;
UserDef_FileSpaceData *sfile_udata = &U.file_space_data;
BLI_assert(sfile->browse_mode == FILE_BROWSE_MODE_FILES);
sfile->browse_mode = FILE_BROWSE_MODE_FILES;
FileSelectParams *params = fileselect_ensure_updated_file_params(sfile);
if (!op) {