Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2020-11-06 11:53:18 +0300
committerSergey Sharybin <sergey@blender.org>2020-11-06 11:54:02 +0300
commit0573f86587d598e5fbe5b8fdc413b5a113443fe9 (patch)
treec536503482e3015b1be15875571087e1df0f221b /source/blender/sequencer
parent9c34391e0c83fc77828aea931a61e2cfbbe541d3 (diff)
Cleanup: Clang-Tidy warnings
Diffstat (limited to 'source/blender/sequencer')
-rw-r--r--source/blender/sequencer/intern/image_cache.c5
-rw-r--r--source/blender/sequencer/intern/sequencer.h6
2 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/sequencer/intern/image_cache.c b/source/blender/sequencer/intern/image_cache.c
index 891d0d74657..4bbf1838b4e 100644
--- a/source/blender/sequencer/intern/image_cache.c
+++ b/source/blender/sequencer/intern/image_cache.c
@@ -742,9 +742,8 @@ static float seq_cache_timeline_frame_to_frame_index(Sequence *seq, float timeli
if (type == SEQ_CACHE_STORE_RAW) {
return seq_give_stripelem_index(seq, timeline_frame);
}
- else {
- return timeline_frame - seq->start;
- }
+
+ return timeline_frame - seq->start;
}
static float seq_cache_frame_index_to_timeline_frame(Sequence *seq, float frame_index)
diff --git a/source/blender/sequencer/intern/sequencer.h b/source/blender/sequencer/intern/sequencer.h
index d5220de809f..a7217e45ddf 100644
--- a/source/blender/sequencer/intern/sequencer.h
+++ b/source/blender/sequencer/intern/sequencer.h
@@ -56,12 +56,12 @@ void BKE_sequencer_base_clipboard_pointers_free(struct ListBase *seqbase);
struct ImBuf *BKE_sequencer_cache_get(const SeqRenderData *context,
struct Sequence *seq,
- float cfra,
+ float timeline_frame,
int type,
bool skip_disk_cache);
void BKE_sequencer_cache_put(const SeqRenderData *context,
struct Sequence *seq,
- float cfra,
+ float timeline_frame,
int type,
struct ImBuf *i,
float cost,
@@ -74,7 +74,7 @@ bool BKE_sequencer_cache_put_if_possible(const SeqRenderData *context,
float cost,
bool skip_disk_cache);
bool BKE_sequencer_cache_recycle_item(struct Scene *scene);
-void BKE_sequencer_cache_free_temp_cache(struct Scene *scene, short id, int cfra);
+void BKE_sequencer_cache_free_temp_cache(struct Scene *scene, short id, int timeline_frame);
void BKE_sequencer_cache_destruct(struct Scene *scene);
void BKE_sequencer_cache_cleanup_all(struct Main *bmain);
void BKE_sequencer_cache_cleanup_sequence(struct Scene *scene,