Merge remote-tracking branch 'origin/blender-v2.81-release'
authorDalai Felinto <dfelinto@gmail.com>
Fri, 15 Nov 2019 15:10:55 +0000 (12:10 -0300)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 15 Nov 2019 15:10:55 +0000 (12:10 -0300)
1  2 
source/blender/editors/space_file/filesel.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c

index bb3906a961b5713f11fed85ef94ad0bf06f05737,1a8a8246eb96cb18bf3277d813fef6fec771669d..f8adf9b707ac2cc621e859782b30068b12e75f71
@@@ -368,9 -382,8 +381,9 @@@ void ED_fileselect_params_to_userdef(Sp
    sfile_udata_new->sort_type = sfile->params->sort;
    sfile_udata_new->details_flags = sfile->params->details_flags;
    sfile_udata_new->flag = sfile->params->flag & PARAMS_FLAGS_REMEMBERED;
 +  sfile_udata_new->filter_id = sfile->params->filter_id;
  
-   if (temp_win_size) {
+   if (temp_win_size && !is_maximized) {
      sfile_udata_new->temp_win_sizex = temp_win_size[0];
      sfile_udata_new->temp_win_sizey = temp_win_size[1];
    }
Simple merge