diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-11-06 16:10:59 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-11-06 17:13:53 +0300 |
commit | 1e7d29b0127f17df3ccd9aba72cf3b27ac9ba5b4 (patch) | |
tree | 40ecae1fc162fe936780269d4445d439f37c09af /source/blender/editors/space_sequencer/sequencer_add.c | |
parent | e91d2ee777466af4f2323daff59aaa8a1ceeec91 (diff) |
Cleanup: rename time related variables
Variables renaned:
- cfra -> timeline_frame
- nr -> frame index
- cfra_over -> overlap_frame
Function seq_give_stripelem_index was renamed to seq_give_frame_index.
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_add.c')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 7335882e947..37dfcdbc765 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -148,7 +148,7 @@ static int sequencer_generic_invoke_xy_guess_channel(bContext *C, int type) Sequence *seq; Scene *scene = CTX_data_scene(C); Editing *ed = BKE_sequencer_editing_get(scene, true); - int cfra = (int)CFRA; + int timeline_frame = (int)CFRA; int proximity = INT_MAX; if (!ed || !ed->seqbasep) { @@ -156,10 +156,10 @@ static int sequencer_generic_invoke_xy_guess_channel(bContext *C, int type) } for (seq = ed->seqbasep->first; seq; seq = seq->next) { - if ((type == -1 || seq->type == type) && (seq->enddisp < cfra) && - (cfra - seq->enddisp < proximity)) { + if ((type == -1 || seq->type == type) && (seq->enddisp < timeline_frame) && + (timeline_frame - seq->enddisp < proximity)) { tgt = seq; - proximity = cfra - seq->enddisp; + proximity = timeline_frame - seq->enddisp; } } @@ -173,17 +173,17 @@ static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, i { Scene *scene = CTX_data_scene(C); - int cfra = (int)CFRA; + int timeline_frame = (int)CFRA; /* Effect strips don't need a channel initialized from the mouse. */ if (!(flag & SEQPROP_NOCHAN) && RNA_struct_property_is_set(op->ptr, "channel") == 0) { RNA_int_set(op->ptr, "channel", sequencer_generic_invoke_xy_guess_channel(C, type)); } - RNA_int_set(op->ptr, "frame_start", cfra); + RNA_int_set(op->ptr, "frame_start", timeline_frame); if ((flag & SEQPROP_ENDFRAME) && RNA_struct_property_is_set(op->ptr, "frame_end") == 0) { - RNA_int_set(op->ptr, "frame_end", cfra + 25); /* XXX arbitrary but ok for now. */ + RNA_int_set(op->ptr, "frame_end", timeline_frame + 25); /* XXX arbitrary but ok for now. */ } if (!(flag & SEQPROP_NOPATHS)) { |