summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-10-05 09:51:53 +0200
committerMarc Mutz <marc.mutz@kdab.com>2016-10-24 10:07:37 +0000
commitb949f984e286c7a34132fbd97301186826dcc7fa (patch)
treea20d9004e5774822fab651983bd8969ca59e3f7e
parent1a5a3f92add2248fb8308bbc40e941d48db8e9b5 (diff)
QRenderAspect: remove misleading check
The check of d->m_renderer against nullptr follows an unconditional deref of the same pointer with no intervening code. It must therefore be always true. Remove it. That done, m_renderer _is_ nullptr after the ctor ran, and before the dtor runs (there's a check), so maybe the code should at least assert the existence of m_renderer before using it. Coverity-Id: 156307 Change-Id: Iacf2c09db1c0a5a55a67cfb6ef2a00652e557d09 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/frontend/qrenderaspect.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index b5d5ef780..2561a6c60 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -316,7 +316,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
// 7 Cleanup Job (depends on RV)
// Create jobs to load in any meshes that are pending
- if (d->m_renderer != Q_NULLPTR && d->m_renderer->isRunning()) {
+ if (d->m_renderer->isRunning()) {
Render::NodeManagers *manager = d->m_renderer->nodeManagers();
QAspectJobPtr pickBoundingVolumeJob = d->m_renderer->pickBoundingVolumeJob();