diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-09-25 12:48:05 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-14 15:59:32 +0000 |
| commit | dd169f1362f151079158ef31763bade97ee2b730 (patch) | |
| tree | ebe9a8989263bf652185dd6a8f8a8858f53a52fb /src/render/framegraph | |
| parent | 41afe7c7fc72303052815cd2f26d217d02671a5a (diff) | |
QCameraSelector: fix allow camera to be null
Change-Id: Idcbe72c55134c2beb6e226d963a8e724ce210738
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/render/framegraph')
| -rw-r--r-- | src/render/framegraph/qcameraselector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp index 37df26beb..d2bc671ca 100644 --- a/src/render/framegraph/qcameraselector.cpp +++ b/src/render/framegraph/qcameraselector.cpp @@ -91,7 +91,7 @@ void QCameraSelector::setCamera(Qt3DCore::QEntity *camera) // Or not previously added as a child of the current node so that // 1) The backend gets notified about it's creation // 2) When the current node is destroyed, it gets destroyed as well - if (!camera->parent()) + if (camera && !camera->parent()) camera->setParent(this); emit cameraChanged(); } |