summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2016-11-21 19:11:37 (GMT)
committerJean-Baptiste Mardelle <jb@kdenlive.org>2016-11-21 19:11:37 (GMT)
commit69ea21c07165082d4cfd54747c6e55a33b214fdc (patch)
treeb30011273764acd279c2e741553cc5964d0091a9
parent7075020d3bb6473bc1029264d1718f37dd90afcd (diff)
Fix render sometimes incorrectly using proxies
CCBUG: 371064
-rw-r--r--src/mainwindow.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a904832..d45586b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3312,7 +3312,6 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
temp.open();
playlistPath = temp.fileName();
}
-
QString playlistContent = pCore->projectManager()->projectSceneList(project->url().adjusted(QUrl::RemoveFilename).path());
if (!chapterFile.isEmpty()) {
int in = 0;
@@ -3394,7 +3393,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
// Do we want proxy rendering
if (project->useProxy() && !m_renderWidget->proxyRendering()) {
- QString root = pCore->binController()->documentRoot();
+ QString root = doc.documentElement().attribute(QStringLiteral("root")) + QStringLiteral("/");
// replace proxy clips with originals
//TODO
@@ -3409,7 +3408,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
QDomElement e = producers.item(n).toElement();
producerResource = EffectsList::property(e, QStringLiteral("resource"));
producerService = EffectsList::property(e, QStringLiteral("mlt_service"));
- if (producerResource.isEmpty()) {
+ if (producerResource.isEmpty() || producerService == QLatin1String("color")) {
continue;
}
if (producerService == QLatin1String("timewarp")) {