aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/coreapi
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-09-18 10:48:41 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 08:52:00 +0200
commit607f2db351edf4b0f677c302fa37733596abe024 (patch)
treed39cbb7371be7844738a8ddfdb3406017122a743 /src/quick/scenegraph/coreapi
parentffaf39e9a7f11d4e2800b3b37160a2a952795614 (diff)
Fix zero pointer access in renderer.
Change-Id: I185af453684c7223c0c9de103eb707d4918b8ae0 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/quick/scenegraph/coreapi')
-rw-r--r--src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index e9d9249bf5..ed76102c2d 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -366,7 +366,7 @@ void Updater::visitTransformNode(Node *n)
QSGTransformNode *tn = static_cast<QSGTransformNode *>(n->sgNode);
if (n->isBatchRoot) {
- if (m_added > 0 && m_roots.size() > 0)
+ if (m_added > 0 && m_roots.last())
renderer->registerBatchRoot(n, m_roots.last());
tn->setCombinedMatrix(m_rootMatrices.last() * *m_combined_matrix_stack.last() * tn->matrix());