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:
authorCampbell Barton <ideasman42@gmail.com>2021-06-22 10:03:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-06-22 10:03:22 +0300
commit6a3bd04e4290b2fb262a71ec0009520833e41e33 (patch)
treee45cc5f423643e1982176cf1ea5abadef76f1238 /source/blender/sequencer/intern/render.c
parent8af2c87f7e82f7abff8217c6de458a743be91f85 (diff)
Cleanup: rename playhead in the UI and code
Current convention is not to use this term, use "current frame", and "timeline frame" in render.c as this is the argument passed in.
Diffstat (limited to 'source/blender/sequencer/intern/render.c')
-rw-r--r--source/blender/sequencer/intern/render.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c
index 76623599864..16adc392b3b 100644
--- a/source/blender/sequencer/intern/render.c
+++ b/source/blender/sequencer/intern/render.c
@@ -273,11 +273,11 @@ static bool seq_is_effect_of(const Sequence *seq_effect, const Sequence *possibl
/* Check if seq must be rendered. This depends on whole stack in some cases, not only seq itself.
* Order of applying these conditions is important. */
-static bool must_render_strip(const Sequence *seq, SeqCollection *strips_under_playhead)
+static bool must_render_strip(const Sequence *seq, SeqCollection *strips_at_timeline_frame)
{
bool seq_have_effect_in_stack = false;
Sequence *seq_iter;
- SEQ_ITERATOR_FOREACH (seq_iter, strips_under_playhead) {
+ SEQ_ITERATOR_FOREACH (seq_iter, strips_at_timeline_frame) {
/* Strips is below another strip with replace blending are not rendered. */
if (seq_iter->blend_mode == SEQ_BLEND_REPLACE && seq->machine < seq_iter->machine) {
return false;
@@ -335,7 +335,7 @@ static void collection_filter_rendered_strips(SeqCollection *collection)
Sequence *seq;
/* Remove sound strips and muted strips from collection, because these are not rendered.
- * Function must_render_strip() don't have to check for these strips anymore. */
+ * Function #must_render_strip() don't have to check for these strips anymore. */
SEQ_ITERATOR_FOREACH (seq, collection) {
if (seq->type == SEQ_TYPE_SOUND_RAM || (seq->flag & SEQ_MUTE) != 0) {
SEQ_collection_remove_strip(seq, collection);