[Bf-blender-cvs] [a3b4290] gooseberry: Don't use number of frames for image collapse for now
Antony Riakiotakis
noreply at git.blender.org
Mon Jun 15 19:09:32 CEST 2015
Commit: a3b429083bf1c2c967c0b7fe458b462199035bad
Author: Antony Riakiotakis
Date: Mon Jun 15 19:07:11 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBa3b429083bf1c2c967c0b7fe458b462199035bad
Don't use number of frames for image collapse for now
===================================================================
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 7d07bf5..a0bc71b 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -479,8 +479,7 @@ static bool is_filtered_file(struct direntry *file, const char *UNUSED(root), Fi
BLI_strncpy(filename, file->relname, sizeof(filename));
BLI_path_frame_strip(filename, false, NULL);
- if ((ofile = BLI_ghash_lookup(filter->unique_image_list, filename)) &&
- numdigits == ofile->collapsed_info.numdigits)
+ if ((ofile = BLI_ghash_lookup(filter->unique_image_list, filename)))
{
CollapsedEntry *collapsed = &ofile->collapsed_info;
is_filtered = false;
@@ -491,6 +490,7 @@ static bool is_filtered_file(struct direntry *file, const char *UNUSED(root), Fi
collapsed->totalsize += file->realsize;
collapsed->maxframe = MAX2(frame, collapsed->maxframe);
collapsed->minframe = MIN2(frame, collapsed->minframe);
+ file->collapsed_info.numdigits = MAX2(numdigits, file->collapsed_info.numdigits);
collapsed->totfiles++;
}
else {
More information about the Bf-blender-cvs
mailing list