[Bf-blender-cvs] [c5ea1d4] gooseberry: Clear previous collapsed data if needed.
Antony Riakiotakis
noreply at git.blender.org
Mon Jun 8 14:41:15 CEST 2015
Commit: c5ea1d47e830265aa347e4a50e72da000c063adb
Author: Antony Riakiotakis
Date: Mon Jun 8 14:40:53 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBc5ea1d47e830265aa347e4a50e72da000c063adb
Clear previous collapsed data if needed.
===================================================================
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 9d241f6..3108c13 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -492,6 +492,9 @@ static bool is_filtered_file(struct direntry *file, const char *UNUSED(root), Fi
collapsed->minframe = MIN2(frame, collapsed->minframe);
}
else {
+ if (file->collapsed_info.list.first) {
+ BLI_freelistN(&file->collapsed_info.list);
+ }
BLI_ghash_insert(filter->unique_image_list, BLI_strdup(filename), file);
file->collapsed_info.totalsize = file->realsize;
file->collapsed_info.maxframe = file->collapsed_info.minframe = frame;
@@ -501,6 +504,9 @@ static bool is_filtered_file(struct direntry *file, const char *UNUSED(root), Fi
}
}
else {
+ if (file->collapsed_info.list.first) {
+ BLI_freelistN(&file->collapsed_info.list);
+ }
/* may have been set in a previous filtering iteration, so always clear */
file->selflag &= ~FILE_SEL_COLLAPSED;
}
More information about the Bf-blender-cvs
mailing list