diff options
Diffstat (limited to 'source/blender/blenkernel/intern/seqcache.c')
-rw-r--r-- | source/blender/blenkernel/intern/seqcache.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index fa4951da161..7d2858050be 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -444,7 +444,7 @@ static void seq_disk_cache_delete_invalid_files(SeqDiskCache *disk_cache, while (cache_file) { next_file = cache_file->next; if (cache_file->cache_type & invalidate_types) { - if (strcmp(cache_dir, cache_file->dir) == 0) { + if (STREQ(cache_dir, cache_file->dir)) { int cfra_start = seq_cache_frame_index_to_cfra(seq, cache_file->start_frame); if (cfra_start > range_start && cfra_start <= range_end) { seq_disk_cache_delete_file(disk_cache, cache_file); @@ -483,10 +483,9 @@ static size_t deflate_imbuf_to_file(ImBuf *ibuf, return BLI_gzip_mem_to_file_at_pos( ibuf->rect, header_entry->size_raw, file, header_entry->offset, level); } - else { - return BLI_gzip_mem_to_file_at_pos( - ibuf->rect_float, header_entry->size_raw, file, header_entry->offset, level); - } + + return BLI_gzip_mem_to_file_at_pos( + ibuf->rect_float, header_entry->size_raw, file, header_entry->offset, level); } static size_t inflate_file_to_imbuf(ImBuf *ibuf, FILE *file, DiskCacheHeaderEntry *header_entry) @@ -495,10 +494,9 @@ static size_t inflate_file_to_imbuf(ImBuf *ibuf, FILE *file, DiskCacheHeaderEntr return BLI_ungzip_file_to_mem_at_pos( ibuf->rect, header_entry->size_raw, file, header_entry->offset); } - else { - return BLI_ungzip_file_to_mem_at_pos( - ibuf->rect_float, header_entry->size_raw, file, header_entry->offset); - } + + return BLI_ungzip_file_to_mem_at_pos( + ibuf->rect_float, header_entry->size_raw, file, header_entry->offset); } static void seq_disk_cache_read_header(FILE *file, DiskCacheHeader *header) @@ -1304,11 +1302,10 @@ bool BKE_sequencer_cache_put_if_possible(const SeqRenderData *context, BKE_sequencer_cache_put(context, seq, cfra, type, ibuf, cost, skip_disk_cache); return true; } - else { - seq_cache_set_temp_cache_linked(scene, scene->ed->cache->last_key); - scene->ed->cache->last_key = NULL; - return false; - } + + seq_cache_set_temp_cache_linked(scene, scene->ed->cache->last_key); + scene->ed->cache->last_key = NULL; + return false; } void BKE_sequencer_cache_put(const SeqRenderData *context, |