Commit: 2f7eb53ed05e7b330624b6c92f55a04bf252af52
Author: Bastien Montagne
Date: Wed Sep 30 20:19:21 2015 +0200
Branches: blender-v2.76-release
https://developer.blender.org/rB2f7eb53ed05e7b330624b6c92f55a04bf252af52
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.
===================================================================
M source/blender/editors/space_file/filelist.c
===================================================================
diff --git a/source/blender/editors/space_file/filelist.c
b/source/blender/editors/space_file/filelist.c
index 0d1aff0..1b5987d 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;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
