summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-08-19 13:16:13 +0100
committerSean Harmer <sean.harmer@kdab.com>2014-11-10 14:36:54 +0100
commit1b2099489bd0dfffaaa0fd4e7003b1501502e20a (patch)
tree4950c3c016ae31366c4b48530bf83585f69224b0
parent54579f55f6a343b8252b2e39f272fbff1b7d2b9f (diff)
downloadqt3d-1b2099489bd0dfffaaa0fd4e7003b1501502e20a.tar.gz
Use viewport clear color from fg node nearest the leaf
Change-Id: I803d6fabe8d2d0969908348f5e7ecbd08fbfee92 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/backend/renderview.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index 2530ad83d..d7b5975cc 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -352,9 +352,12 @@ void RenderView::setConfigFromFrameGraphLeafNode(FrameGraphNode *fgLeaf)
}
ViewportNode *vpNode = static_cast<ViewportNode *>(node);
*m_viewport = computeViewport(*m_viewport, vpNode);
+
+ // We take the clear color from the viewport node nearest the leaf
if (!m_clearColor)
m_clearColor = m_allocator->allocate<QColor>();
- *m_clearColor = vpNode->clearColor();
+ if (!m_clearColor->isValid())
+ *m_clearColor = vpNode->clearColor();
break;
}