From 98336348155f93d6b78cb19e00bea5c75f796131 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 6 Apr 2019 11:08:39 +1100 Subject: [PATCH] fixed shared cross dissolve frozen at start frame --- rendering/renderfunctions.cpp | 2 +- timeline/clip.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rendering/renderfunctions.cpp b/rendering/renderfunctions.cpp index 40e22cc0d..054a41f2e 100644 --- a/rendering/renderfunctions.cpp +++ b/rendering/renderfunctions.cpp @@ -397,7 +397,7 @@ GLuint olive::rendering::compose_sequence(ComposeSequenceParams ¶ms) { if (c->media() != nullptr && c->media()->get_type() == MEDIA_TYPE_FOOTAGE) { // retrieve video frame from cache and store it in c->texture - c->Cache(qMax(playhead, c->timeline_in()), false, params.nests, params.playback_speed); + c->Cache(qMax(playhead, c->timeline_in(true)), false, params.nests, params.playback_speed); if (!c->Retrieve()) { params.texture_failed = true; } else { diff --git a/timeline/clip.cpp b/timeline/clip.cpp index 2fe81cc38..822847e0e 100644 --- a/timeline/clip.cpp +++ b/timeline/clip.cpp @@ -318,7 +318,7 @@ void Clip::Save(QXmlStreamWriter &stream) long Clip::clip_in(bool with_transition) { if (with_transition && opening_transition != nullptr && opening_transition->secondary_clip != nullptr) { - // we must be the secondary clip, so return (timeline in - length) + // we must be the secondary clip, so return (clip in - length) return clip_in_ - opening_transition->get_true_length(); } return clip_in_; @@ -344,7 +344,7 @@ void Clip::set_timeline_in(long t) long Clip::timeline_out(bool with_transitions) { if (with_transitions && closing_transition != nullptr && closing_transition->secondary_clip != nullptr) { - // we must be the primary clip, so return (timeline out + length2) + // we must be the primary clip, so return (timeline out + length) return timeline_out_ + closing_transition->get_true_length(); } else { return timeline_out_;