diff options
| author | Keränen Pasi <pasi.keranen@digia.com> | 2013-09-19 12:57:43 +0300 |
|---|---|---|
| committer | Pasi Keränen <pasi.keranen@digia.com> | 2013-09-19 13:14:37 +0300 |
| commit | 14c8349dc0999f07c50504e70c91a604722eebf2 (patch) | |
| tree | df19ad3b1387f5782a9a7cca092cb3d8a4ba716f /src/datavisualization/engine/q3dscene.cpp | |
| parent | 802681d854d93a50547585570da3bcf7b6c41636 (diff) | |
Fixes to setting of active camera and light in the scene.
Change-Id: Ibe70e175ded6e853b4f37db13160d5f99fad6c98
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dscene.cpp')
| -rw-r--r-- | src/datavisualization/engine/q3dscene.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index 2ad15a03..53bfe480 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -204,8 +204,10 @@ Q3DCamera *Q3DScene::activeCamera() const void Q3DScene::setActiveCamera(Q3DCamera *camera) { + Q_ASSERT(camera); + // Add new camera as child of the scene - if (!children().contains(camera)) + if (camera->parent() != this) camera->setParent(this); if (camera != d_ptr->m_camera) { @@ -227,8 +229,10 @@ Q3DLight *Q3DScene::activeLight() const void Q3DScene::setActiveLight(Q3DLight *light) { + Q_ASSERT(light); + // Add new light as child of the scene - if (!children().contains(light)) + if (light->parent() != this) light->setParent(this); if (light != d_ptr->m_light) { |