diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-05-14 16:45:27 +0300 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-05-16 09:43:39 +0000 |
| commit | 69ab38dd3a6c16325dc6bb048c86235220a3086c (patch) | |
| tree | e9f9c92328b721a75e765f5c2445568051822104 | |
| parent | 893c05ce903fcd58f17598abb48d985c641ac0e5 (diff) | |
Fix image loading when using Q3DSSurfaceViewer
Delayed loading bool was never properly propagated to the runtime. A
pointer was instead converted to a bool value and was always true
causing delayed loading to be enabled and images not be loaded.
Task-number: QT3DS-3411
Change-Id: I4b328077625942e846d08129313ef21e6d0c5a45
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| -rw-r--r-- | src/Viewer/studio3d/q3dssurfaceviewer.cpp | 1 | ||||
| -rw-r--r-- | src/Viewer/studio3d/q3dswidget.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/Viewer/studio3d/q3dssurfaceviewer.cpp b/src/Viewer/studio3d/q3dssurfaceviewer.cpp index abbc580b..fc90e341 100644 --- a/src/Viewer/studio3d/q3dssurfaceviewer.cpp +++ b/src/Viewer/studio3d/q3dssurfaceviewer.cpp @@ -375,6 +375,7 @@ bool Q3DSSurfaceViewerPrivate::initializeRuntime() int(m_size.height() * m_pixelRatio), m_context->format(), m_fboId, localSource, m_presentation->variantList(), + m_presentation->delayedLoading(), m_presentation->d_ptr->streamProxy())) { releaseRuntime(); qWarning("Failed to initialize runtime"); diff --git a/src/Viewer/studio3d/q3dswidget.cpp b/src/Viewer/studio3d/q3dswidget.cpp index 38363e64..23334b5b 100644 --- a/src/Viewer/studio3d/q3dswidget.cpp +++ b/src/Viewer/studio3d/q3dswidget.cpp @@ -286,6 +286,7 @@ bool Q3DSWidgetPrivate::initializeRuntime() q_ptr->context()->format(), q_ptr->defaultFramebufferObject(), localSource, m_presentation->variantList(), + m_presentation->delayedLoading(), m_presentation->d_ptr->streamProxy())) { releaseRuntime(); qWarning("Failed to initialize runtime"); |