diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-03-29 06:52:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 08:48:08 +0200 |
| commit | bd54c80e4b60f922bf29154e8c1131c274a603a8 (patch) | |
| tree | 500cda0ebb88046f23addcb9fd9b36261d7ebe11 | |
| parent | 001d5791e5d6f0beefcc84cb53be0ddf09ea692c (diff) | |
Don't crash when render node doesn't have a batchroot
Change-Id: Ib8f70414eb477b4ec45097c8784a5fe1375cf012
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index a691ebb801..265ca5543e 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -2475,7 +2475,9 @@ void Renderer::renderRenderNode(Batch *batch) QMatrix4x4 matrix; while (xform != rootNode()) { if (xform->type() == QSGNode::TransformNodeType) { - matrix = qsg_matrixForRoot(e->root) * static_cast<QSGTransformNode *>(xform)->combinedMatrix(); + matrix = static_cast<QSGTransformNode *>(xform)->combinedMatrix(); + if (e->root) + matrix = qsg_matrixForRoot(e->root) * matrix; break; } xform = xform->parent(); |