diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-16 18:09:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-16 18:09:28 +0300 |
| commit | d96b8e168f3c809cd79f6028dbf99eeeebb71302 (patch) | |
| tree | 75ee78ee75ea602c2c698f4b4ec8494093b949c7 /source/blender/editors/space_file | |
| parent | 76c99f361f58752eff8054f5cff52cad9ce57145 (diff) | |
| parent | 4b39069908c88099860c04a3b7d3b4aae0a272f5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 14719322bf7..6af36ea6778 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -1405,7 +1405,9 @@ void filelist_setdir(struct FileList *filelist, char *r_dir) BLI_assert(strlen(r_dir) < FILE_MAX_LIBEXTRA); BLI_cleanup_dir(G.main->name, r_dir); - BLI_assert(filelist->checkdirf(filelist, r_dir, true)); + const bool is_valid_path = filelist->checkdirf(filelist, r_dir, true); + BLI_assert(is_valid_path); + UNUSED_VARS_NDEBUG(is_valid_path); if (!STREQ(filelist->filelist.root, r_dir)) { BLI_strncpy(filelist->filelist.root, r_dir, sizeof(filelist->filelist.root)); @@ -1651,6 +1653,7 @@ bool filelist_file_cache_block(struct FileList *filelist, const int index) int start_index = max_ii(0, index - (cache_size / 2)); int end_index = min_ii(nbr_entries, index + (cache_size / 2)); int i; + const bool full_refresh = (filelist->flags & FL_IS_READY) == 0; if ((index < 0) || (index >= nbr_entries)) { // printf("Wrong index %d ([%d:%d])", index, 0, nbr_entries); @@ -1673,8 +1676,8 @@ bool filelist_file_cache_block(struct FileList *filelist, const int index) // start_index, end_index, index, cache->block_start_index, cache->block_end_index); /* If we have something to (re)cache... */ - if ((start_index != cache->block_start_index) || (end_index != cache->block_end_index)) { - if ((start_index >= cache->block_end_index) || (end_index <= cache->block_start_index)) { + if (full_refresh || (start_index != cache->block_start_index) || (end_index != cache->block_end_index)) { + if (full_refresh || (start_index >= cache->block_end_index) || (end_index <= cache->block_start_index)) { int size1 = cache->block_end_index - cache->block_start_index; int size2 = 0; int idx1 = cache->block_cursor, idx2 = 0; |