Fix error in track compositing breaking some compositions

parent 39ba45dd
......@@ -1424,7 +1424,6 @@ bool TimelineModel::requestCompositionInsertion(const QString &transitionId, int
if (result && logUndo) {
PUSH_UNDO(undo, redo, i18n("Insert Composition"));
}
_resetView();
return result;
}
......@@ -1684,13 +1683,6 @@ bool TimelineModel::replantCompositions(int currentCompo, bool updateView)
for (const auto &compo : compos) {
int aTrack = m_allCompositions[compo.second]->getATrack();
Q_ASSERT(aTrack != -1);
if (!trackCompositions.isEmpty()) {
int compositingB = trackCompositions.first()->get_b_track();
if (compositingB < compo.first) {
Mlt::Transition *firstTr = trackCompositions.takeFirst();
field->plant_transition(*firstTr, firstTr->get_a_track(), compositingB);
}
}
int ret = field->plant_transition(*m_allCompositions[compo.second].get(), aTrack, compo.first);
qDebug() << "Planting composition " << compo.second << "in " << aTrack << "/" << compo.first << "IN = " << m_allCompositions[compo.second]->getIn()
......
......@@ -470,6 +470,7 @@ Rectangle {
KeyframeView {
id: effectRow
visible: clipRoot.showKeyframes && keyframeModel
selected: clipRoot.selected
inPoint: clipRoot.inPoint
outPoint: clipRoot.outPoint
}
......
......@@ -171,6 +171,7 @@ Item {
KeyframeView {
id: effectRow
visible: compositionRoot.showKeyframes && keyframeModel
selected: compositionRoot.selected
inPoint: 0
outPoint: compositionRoot.clipDuration
}
......
......@@ -33,6 +33,7 @@ Rectangle
property int activeIndex
property int inPoint
property int outPoint
property bool selected
onKfrCountChanged: {
keyframecanvas.requestPaint()
......@@ -94,7 +95,7 @@ Rectangle
}
width: Math.max(1, timeScale)
color: kfMouseArea.containsMouse ? 'darkred' : 'transparent'
visible: clipRoot.selected
visible: keyframeContainer.selected
MouseArea {
id: kfMouseArea
anchors.fill: parent
......
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