diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-06-22 10:03:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-06-22 10:03:22 +0300 |
commit | 6a3bd04e4290b2fb262a71ec0009520833e41e33 (patch) | |
tree | e45cc5f423643e1982176cf1ea5abadef76f1238 | |
parent | 8af2c87f7e82f7abff8217c6de458a743be91f85 (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.
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 8 | ||||
-rw-r--r-- | source/blender/sequencer/intern/render.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 4c8b44864f9..937ac6b9dcb 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2486,7 +2486,7 @@ static int sequencer_paste_exec(bContext *C, wmOperator *op) min_seq_startdisp = seq->startdisp; } } - /* Paste strips after playhead. */ + /* Paste strips relative to the current-frame. */ ofs = scene->r.cfra - min_seq_startdisp; } @@ -2539,7 +2539,11 @@ void SEQUENCER_OT_paste(wmOperatorType *ot) /* Properties. */ PropertyRNA *prop = RNA_def_boolean( - ot->srna, "keep_offset", false, "Keep Offset", "Keep strip offset to playhead when pasting"); + ot->srna, + "keep_offset", + false, + "Keep Offset", + "Keep strip offset relative to the current frame when pasting"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); } 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); |