[Bf-blender-cvs] [9355446] master: Fix T46070: Content of folders with a .blend extension aren't listed until filtering is disabled.

Bastien Montagne noreply at git.blender.org
Thu Sep 10 22:09:52 CEST 2015


Commit: 935544671636fd679a607d380c11c4176b22bb6f
Author: Bastien Montagne
Date:   Thu Sep 10 22:08:47 2015 +0200
Branches: master
https://developer.blender.org/rB935544671636fd679a607d380c11c4176b22bb6f

Fix T46070: Content of folders with a .blend extension aren't listed until filtering is disabled.

Own stupid mistake somewhere during filebrowser revamp...

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

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 192866e..0c65258 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -2191,14 +2191,14 @@ static int filelist_readjob_list_dir(
 
 			entry = MEM_callocN(sizeof(*entry), __func__);
 			entry->relpath = MEM_dupallocN(files[i].relname);
-			if (S_ISDIR(files[i].s.st_mode)) {
-				entry->typeflag |= FILE_TYPE_DIR;
-			}
 			entry->st = files[i].s;
 
 			/* Set file type. */
-			/* If we are considering .blend files as libs, promote them to directory status! */
-			if (do_lib && BLO_has_bfile_extension(entry->relpath)) {
+			if (S_ISDIR(files[i].s.st_mode)) {
+				entry->typeflag = FILE_TYPE_DIR;
+			}
+			else if (do_lib && BLO_has_bfile_extension(entry->relpath)) {
+				/* If we are considering .blend files as libs, promote them to directory status. */
 				char name[FILE_MAX];
 
 				entry->typeflag = FILE_TYPE_BLENDER;




More information about the Bf-blender-cvs mailing list