[Bf-blender-cvs] [ef71668ac5d] master: Merge remote-tracking branch 'origin/blender-v2.81-release'

[Dalai Felinto]

Commit: ef71668ac5d951736fe51abf4529e604867d45fd
Author: Dalai Felinto
Date:   Fri Nov 15 12:10:55 2019 -0300
Branches: master
https://developer.blender.org/rBef71668ac5d951736fe51abf4529e604867d45fd

Merge remote-tracking branch 'origin/blender-v2.81-release'

===================================================================



===================================================================

diff --cc source/blender/editors/space_file/filesel.c
index bb3906a961b,1a8a8246eb9..f8adf9b707a
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@@ -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];
    }