Commit 741e4196 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix dragging favorite effect to master

Fix master effectstack keyframe seeking
parent 2e5be9b9
Pipeline #10305 passed with stage
in 13 minutes and 28 seconds
......@@ -361,6 +361,7 @@ void MainWindow::init()
case ObjectType::TimelineTrack:
case ObjectType::TimelineClip:
case ObjectType::TimelineComposition:
case ObjectType::Master:
getCurrentTimeline()->controller()->setPosition(pos);
break;
case ObjectType::BinClip:
......@@ -2644,7 +2645,7 @@ void MainWindow::addEffect(const QString &effectId)
QVariantMap effectData;
effectData.insert(QStringLiteral("kdenlive/effect"), effectId);
pCore->window()->getMainTimeline()->controller()->addAsset(effectData);
} else if (m_assetPanel->effectStackOwner().first == ObjectType::TimelineTrack || m_assetPanel->effectStackOwner().first == ObjectType::BinClip) {
} else if (m_assetPanel->effectStackOwner().first == ObjectType::TimelineTrack || m_assetPanel->effectStackOwner().first == ObjectType::BinClip || m_assetPanel->effectStackOwner().first == ObjectType::Master) {
if (!m_assetPanel->addEffect(effectId)) {
pCore->displayMessage(i18n("Cannot add effect to clip"), InformationMessage);
}
......
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