[Bf-blender-cvs] [309c66d] gooseberry: Fix issue with collapsed images during last weekly.

Antony Riakiotakis noreply at git.blender.org
Mon Jun 8 12:54:41 CEST 2015


Commit: 309c66d4c3d32e8e69394972e08dcc9f7403e52d
Author: Antony Riakiotakis
Date:   Mon Jun 8 12:54:32 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB309c66d4c3d32e8e69394972e08dcc9f7403e52d

Fix issue with collapsed images during last weekly.

We need to clear the collapsed flag when it does not apply anymore, so
files get displayed properly.

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

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 0df9aa0..b208536 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -499,6 +499,10 @@ static bool is_filtered_file(struct direntry *file, const char *UNUSED(root), Fi
 			}
 		}
 	}
+	else {
+		/* may have been set in a previous filtering iteration, so always clear */
+		file->selflag &= ~FILE_SEL_COLLAPSED;
+	}
 
 	return is_filtered;
 }




More information about the Bf-blender-cvs mailing list