[Bf-blender-cvs] [7c1fbe24ca3] blender-v2.81-release: Fix T71019: Disappearing file thumbnails & crash on area split

Julian Eisel noreply at git.blender.org
Mon Oct 28 19:35:55 CET 2019


Commit: 7c1fbe24ca33a13e61043aa73b2fd7db20627171
Author: Julian Eisel
Date:   Mon Oct 28 19:22:44 2019 +0100
Branches: blender-v2.81-release
https://developer.blender.org/rB7c1fbe24ca33a13e61043aa73b2fd7db20627171

Fix T71019: Disappearing file thumbnails & crash on area split

When opening the file browser as regular editor, the ID filter flags
as stored in FileSelectParams were not set explicitly, so they were 0.
Since 9100982e8097, the value actually passed to the filtering could
differ from that, causing the file list cache to be constantly updated
on every redraw.

Caused by 9100982e8097.

Note that this "accidentially" got fixed in master with b54626364253,
which is why the issue only showed up in the release branch from that
point.

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

M	source/blender/editors/space_file/filesel.c

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

diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index ba4ccb4fba9..3776b660859 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -107,6 +107,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
     sfile->params->thumbnail_size = U_default.file_space_data.thumbnail_size;
     /* Show size column by default. */
     sfile->params->details_flags = U_default.file_space_data.details_flags;
+    sfile->params->filter_id = FILTER_ID_ALL;
   }
 
   params = sfile->params;
@@ -246,9 +247,6 @@ short ED_fileselect_set_params(SpaceFile *sfile)
       }
     }
 
-    /* For now, always init filterid to 'all true' */
-    params->filter_id = FILTER_ID_ALL;
-
     if (U.uiflag & USER_HIDE_DOT) {
       params->flag |= FILE_HIDE_DOT;
     }



More information about the Bf-blender-cvs mailing list