summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian De Bhal <julian.debhal@nokia.com>2012-07-09 15:01:47 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-16 01:35:10 +0200
commit8cf9ee2ac85ee402ef0de064caea813a7a06f507 (patch)
tree08f1a4b316094498c61a7abf08b36e87a106b328
parentf7b445588a920cd0fba7085f9180f0b7a36b834a (diff)
downloadqt3d-8cf9ee2ac85ee402ef0de064caea813a7a06f507.tar.gz
Add camera context to viewport lighting
Change-Id: I317cf334e079afc7baa03e7144e234ac3e6be6ec Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
-rw-r--r--src/imports/threed/viewport.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/threed/viewport.cpp b/src/imports/threed/viewport.cpp
index 5596ab63d..907edf5ed 100644
--- a/src/imports/threed/viewport.cpp
+++ b/src/imports/threed/viewport.cpp
@@ -976,7 +976,8 @@ void Viewport::draw(QGLPainter *painter)
painter->setObjectPickId(-1);
QObjectList list = QObject::children();
- painter->setMainLight(d->light, camera()->modelViewMatrix());
+ painter->setMainLight(d->light,
+ camera() ? camera()->modelViewMatrix() : QMatrix4x4());
painter->setLightModel(d->lightModel);
foreach (QObject *child, list) {
QQuickItem3D *item = qobject_cast<QQuickItem3D *>(child);