eessppeelllloo/kdenlive
1
0
Fork 0
mirror of https://invent.kde.org/multimedia/kdenlive synced 2025-12-05 15:59:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/25.12'

Browse Source
This commit is contained in:
Jean-Baptiste Mardelle
2025-12-03 13:44:03 +01:00
parent 2009081293 3411ddfb05
commit 5386421188
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets/keyframes/model/rect/rotatedrecthelper.cpp
View File

@@ -75,7 +75,6 @@ void RotatedRectHelper::slotUpdateFromMonitorRect(const QRectF &rect)
}
// Update the model
m_model->setParameter(QLatin1String(""), newValue, true, rectIndex);
Q_EMIT updateKeyframeData(rectIndex, QVariant(newValue));
}

6
src/timeline2/model/timelineitemmodel.cpp
View File

@@ -807,6 +807,9 @@ void TimelineItemModel::buildTrackCompositing(bool rebuild)
QString composite;
if (pCore->currentDoc()->getSequenceProperty(m_uuid, QStringLiteral("compositing"), QStringLiteral("1")).toInt() > 0) {
composite = TransitionsRepository::get()->getCompositingTransition();
if (composite.isEmpty()) {
pCore->displayMessage(i18n("Could not setup track compositing, check your install"), MessageType::ErrorMessage);
}
}
int videoTracks = 0;
int audioTracks = 0;
@@ -850,9 +853,6 @@ void TimelineItemModel::buildTrackCompositing(bool rebuild)
if (isMultiTrack) {
pCore->enableMultiTrack(true);
}
if (composite.isEmpty()) {
pCore->displayMessage(i18n("Could not setup track compositing, check your install"), MessageType::ErrorMessage);
}
}
void TimelineItemModel::notifyChange(const QModelIndex &topleft, const QModelIndex &bottomright, int role)