diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 09:59:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:17:38 +0100 |
| commit | 1c52a489c1eed52107cdde28890ca230424bd85b (patch) | |
| tree | 58ddbb1d579e603b8737aeb4ec46131978ca780d /src/render/frontend/qrenderaspect.cpp | |
| parent | 4a4b5383e8e2a33db2b95b5540da430df0835125 (diff) | |
| parent | 6c248da9fc6715ed5bf26cb4105792e0b0964da0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Conflicts:
src/core/resources/qframeallocator.cpp
src/plugins/sceneparsers/gltf/gltfparser.cpp
src/render/frontend/qrenderaspect.cpp
tests/auto/render/renderqueue/tst_renderqueue.cpp
Change-Id: Icdc2be2c80e7de6135a09e2f370ee004e395f514
Diffstat (limited to 'src/render/frontend/qrenderaspect.cpp')
| -rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 320bfa677..00dd9c327 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -358,7 +358,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) // QChangeArbiter::syncChanges() that happens just before the render aspect is // asked for jobs to execute (this function). If that is the case, the RenderSettings will // be null and we should not generate any jobs. - if (d->m_renderer != nullptr && d->m_renderer->isRunning() && d->m_renderer->settings()) { + if (d->m_renderer->isRunning() && d->m_renderer->settings()) { // don't spawn any jobs, if the renderer decides to skip this frame if (!d->m_renderer->shouldRender()) { d->m_renderer->skipNextFrame(); |