diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-18 09:26:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-02-18 22:13:18 +0100 |
| commit | fd49b4a2b935362fa76ce3297576addf459bf120 (patch) | |
| tree | 1c5a4e3efa6d08908e1856abf7ec414105aa818e /src/gui/util/qshadergraph.cpp | |
| parent | 9029c5586460950b4fa6773a5d08c67e5ba16e8a (diff) | |
| parent | b9585277e78f0571933706507ba2024c68d6df19 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/gui/util/qshadergraph.cpp')
| -rw-r--r-- | src/gui/util/qshadergraph.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/gui/util/qshadergraph.cpp b/src/gui/util/qshadergraph.cpp index b05b7107136..46fe6ac6d67 100644 --- a/src/gui/util/qshadergraph.cpp +++ b/src/gui/util/qshadergraph.cpp @@ -44,13 +44,20 @@ QT_BEGIN_NAMESPACE namespace { - QVector<QShaderNode> copyOutputNodes(const QVector<QShaderNode> &nodes) + QVector<QShaderNode> copyOutputNodes(const QVector<QShaderNode> &nodes, const QVector<QShaderGraph::Edge> &edges) { auto res = QVector<QShaderNode>(); std::copy_if(nodes.cbegin(), nodes.cend(), std::back_inserter(res), - [] (const QShaderNode &node) { - return node.type() == QShaderNode::Output; + [&edges] (const QShaderNode &node) { + return node.type() == QShaderNode::Output || + (node.type() == QShaderNode::Function && + !std::any_of(edges.cbegin(), + edges.cend(), + [&node] (const QShaderGraph::Edge &edge) { + return edge.sourceNodeUuid == + node.uuid(); + })); }); return res; } @@ -210,8 +217,8 @@ QVector<QShaderGraph::Statement> QShaderGraph::createStatements(const QStringLis auto result = QVector<Statement>(); QVector<Edge> currentEdges = enabledEdges; - QVector<QUuid> currentUuids = [enabledNodes] { - const QVector<QShaderNode> inputs = copyOutputNodes(enabledNodes); + QVector<QUuid> currentUuids = [enabledNodes, enabledEdges] { + const QVector<QShaderNode> inputs = copyOutputNodes(enabledNodes, enabledEdges); auto res = QVector<QUuid>(); std::transform(inputs.cbegin(), inputs.cend(), std::back_inserter(res), |