diff options
| author | Mauro Persano <mauro.persano@kdab.com> | 2017-06-05 21:04:44 -0300 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2017-06-06 06:15:35 +0000 |
| commit | 1a636c7a518d235fc95c822316da4fe640ed7df7 (patch) | |
| tree | 8b4a1b8c7a2f2f3e76227a5b4c6ed703518b65b2 /src/render/jobs/renderviewjobutils.cpp | |
| parent | ff6518ebf0bcfe982f4b0e21eb5c3c8d6fc7ea07 (diff) | |
Make render states honor the enabled flag
Currently render states are added even when enabled is false. Don't add
them to the render state set if they are disabled.
Task-number: QTBUG-60419
Change-Id: I89841b9978b5f47e71cf378796726bbaedebc127
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/jobs/renderviewjobutils.cpp')
| -rw-r--r-- | src/render/jobs/renderviewjobutils.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp index 9f1b51cc1..05e99314e 100644 --- a/src/render/jobs/renderviewjobutils.cpp +++ b/src/render/jobs/renderviewjobutils.cpp @@ -402,8 +402,11 @@ void addToRenderStateSet(RenderStateSet *stateSet, const QVector<Qt3DCore::QNodeId> stateIds, RenderStateManager *manager) { - for (const Qt3DCore::QNodeId &stateId : stateIds) - stateSet->addState(manager->lookupResource(stateId)->impl()); + for (const Qt3DCore::QNodeId &stateId : stateIds) { + RenderStateNode *node = manager->lookupResource(stateId); + if (node->isEnabled()) + stateSet->addState(node->impl()); + } } namespace { |