From dd169f1362f151079158ef31763bade97ee2b730 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Fri, 25 Sep 2015 12:48:05 +0200 Subject: QCameraSelector: fix allow camera to be null Change-Id: Idcbe72c55134c2beb6e226d963a8e724ce210738 Reviewed-by: Andy Nichols --- src/render/framegraph/qcameraselector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/render/framegraph') 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(); } -- cgit v1.2.3