Commit c7b91a51 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '1904'

parents 0bcf22b0 1f1938a2
...@@ -111,7 +111,7 @@ int ClipModel::construct(const std::shared_ptr<TimelineModel> &parent, const QSt ...@@ -111,7 +111,7 @@ int ClipModel::construct(const std::shared_ptr<TimelineModel> &parent, const QSt
} }
auto result = binClip->giveMasterAndGetTimelineProducer(id, producer, state); auto result = binClip->giveMasterAndGetTimelineProducer(id, producer, state);
std::shared_ptr<ClipModel> clip(new ClipModel(parent, result.first, binClipId, id, state, speed)); std::shared_ptr<ClipModel> clip(new ClipModel(parent, result.first, binClipId, id, state, speed));
clip->setClipState_lambda(state); clip->setClipState_lambda(state)();
parent->registerClip(clip); parent->registerClip(clip);
clip->m_effectStack->importEffects(producer, state, result.second); clip->m_effectStack->importEffects(producer, state, result.second);
clip->m_clipMarkerModel->setReferenceModel(binClip->getMarkerModel(), speed); clip->m_clipMarkerModel->setReferenceModel(binClip->getMarkerModel(), speed);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment