Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a97cae3efc - Show all commits

5
source/blender/sequencer/intern/strip_time.c
View File

@ -85,7 +85,7 @@ float seq_give_frame_index(const Scene *scene, Sequence *seq, float timeline_fra
if (SEQ_retiming_is_active(seq)) { if (SEQ_retiming_is_active(seq)) {
const float retiming_factor = seq_retiming_evaluate(seq, frame_index); const float retiming_factor = seq_retiming_evaluate(seq, frame_index);
frame_index = retiming_factor * (length - 1); frame_index = retiming_factor * (length);
} }
/* Clamp frame index to strip content frame range. */ /* Clamp frame index to strip content frame range. */
frame_index = clamp_f(frame_index, 0, length); frame_index = clamp_f(frame_index, 0, length);
@ -504,8 +504,7 @@ int SEQ_time_strip_length_get(const Scene *scene, const Sequence *seq)
SeqRetimingHandle *handle_start = seq->retiming_handles; SeqRetimingHandle *handle_start = seq->retiming_handles;
SeqRetimingHandle *handle_end = seq->retiming_handles + (SEQ_retiming_handles_count(seq) - 1); SeqRetimingHandle *handle_end = seq->retiming_handles + (SEQ_retiming_handles_count(seq) - 1);
return handle_end->strip_frame_index / seq_time_media_playback_rate_factor_get(scene, seq) - return handle_end->strip_frame_index / seq_time_media_playback_rate_factor_get(scene, seq) -
(handle_start->strip_frame_index + 1) / (handle_start->strip_frame_index) / seq_time_media_playback_rate_factor_get(scene, seq);
seq_time_media_playback_rate_factor_get(scene, seq);
} }
return seq->len / seq_time_media_playback_rate_factor_get(scene, seq); return seq->len / seq_time_media_playback_rate_factor_get(scene, seq);