summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/scene3d
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-01-21 13:08:32 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-01-22 14:29:17 +0000
commit31e4d157c6b0af0c04546af643707a3811583455 (patch)
tree4f5c13cfea1b61a2fb03596ac3c5785e5bbb3b7b /src/quick3d/imports/scene3d
parent58cd67f452433027e1db6271e633460ad8cf2bd8 (diff)
Renderer/Scene3D: fixes to make it work without setData
Change-Id: Iec1d3bab2e3a5a25d1cbb5129addebd83b225580 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/imports/scene3d')
-rw-r--r--src/quick3d/imports/scene3d/scene3ditem.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp
index 552204ffd..a69a63ca6 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.cpp
+++ b/src/quick3d/imports/scene3d/scene3ditem.cpp
@@ -202,7 +202,10 @@ void Scene3DItem::setWindowSurface(QObject *rootObject)
return;
}
- surfaceSelector->setWindow(this->window());
+ // Set the item's window surface if it appears
+ // the surface wasn't set on the surfaceSelector
+ if (!surfaceSelector->window())
+ surfaceSelector->setWindow(this->window());
}
void Scene3DItem::setCameraAspectModeHelper()