diff options
| author | Yiming Wu <xp8110@outlook.com> | 2022-06-02 16:27:09 +0300 |
|---|---|---|
| committer | Yiming Wu <xp8110@outlook.com> | 2022-06-02 16:27:28 +0300 |
| commit | 04f67fb2dbf38e05d9c4855d2b214d545913c850 (patch) | |
| tree | c7875a5a8ee51a8448210498363ed8e8ac5b4b68 /source/blender/blenloader/intern/versioning_300.c | |
| parent | e3363451667299b1cbc85b04bcec3f106e5dc216 (diff) | |
| parent | 432c4c74ebe6f66b83e06ff7fca70c96d0526d6a (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lineart-containedtemp-lineart-contained
Diffstat (limited to 'source/blender/blenloader/intern/versioning_300.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index cce1c757c0b..e13d747914e 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -405,7 +405,9 @@ static void do_versions_sequencer_speed_effect_recursive(Scene *scene, const Lis v->speed_control_type = SEQ_SPEED_MULTIPLY; v->speed_fader = globalSpeed * ((float)seq->seq1->len / - max_ff((float)(seq->seq1->enddisp - seq->seq1->start), 1.0f)); + max_ff((float)(SEQ_time_right_handle_frame_get(seq->seq1) - + seq->seq1->start), + 1.0f)); } } else if (v->flags & SEQ_SPEED_INTEGRATE) { |