diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-01-21 13:08:32 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-01-22 14:29:17 +0000 |
| commit | 31e4d157c6b0af0c04546af643707a3811583455 (patch) | |
| tree | 4f5c13cfea1b61a2fb03596ac3c5785e5bbb3b7b /src/render/framegraph | |
| parent | 58cd67f452433027e1db6271e633460ad8cf2bd8 (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/render/framegraph')
| -rw-r--r-- | src/render/framegraph/qrendersurfaceselector.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp index e218672e8..4f6533e5a 100644 --- a/src/render/framegraph/qrendersurfaceselector.cpp +++ b/src/render/framegraph/qrendersurfaceselector.cpp @@ -46,6 +46,7 @@ namespace Qt3DRender { QRenderSurfaceSelectorPrivate::QRenderSurfaceSelectorPrivate() : Qt3DRender::QFrameGraphNodePrivate() + , m_surface(Q_NULLPTR) { } @@ -73,7 +74,7 @@ QSurface *QRenderSurfaceSelector::surface() const QWindow *QRenderSurfaceSelector::window() const { Q_D(const QRenderSurfaceSelector); - if (d->m_surface->surfaceClass() == QSurface::Window) + if (d->m_surface && d->m_surface->surfaceClass() == QSurface::Window) return static_cast<QWindow *>(d->m_surface); return Q_NULLPTR; } |