diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-09-30 21:19:21 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-09-30 21:20:44 +0300 |
| commit | 22ec991e6b8f19da39ac27f988f1eaab3027b421 (patch) | |
| tree | 0b83834d97183ee201187e3295715d0484a997ee /source/blender/editors/space_file/filelist.c | |
| parent | fabde2ab43e105f88b552561b077ea06672e6245 (diff) | |
Fix T46331: File open does not show thumbnails, when a filter_glob is provided by python scripts.
No reason to exclude usual file-type 'guessing' for operator-filtered extensions...
Safe for 2.76, should we need to merge more fixes.
Diffstat (limited to 'source/blender/editors/space_file/filelist.c')
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 0d1aff09e9c..1b5987d0901 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -2215,11 +2215,9 @@ static int filelist_readjob_list_dir( } /* Otherwise, do not check extensions for directories! */ else if (!(entry->typeflag & FILE_TYPE_DIR)) { + entry->typeflag = file_extension_type(root, entry->relpath); if (filter_glob[0] && BLI_testextensie_glob(entry->relpath, filter_glob)) { - entry->typeflag = FILE_TYPE_OPERATOR; - } - else { - entry->typeflag = file_extension_type(root, entry->relpath); + entry->typeflag |= FILE_TYPE_OPERATOR; } } |