Fix setting sub-presentation to a material's IBL Override

Now setting a sub-presentation to a material's IBL Override renders
correctly in the viewer.

Task-number: QT3DS-2336
Change-Id: I93ac38978b0ea0e8c956f39ee299be573dc7c07d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 10 insertions, 3 deletions

diff --git a/src/runtime/q3dsscenemanager.cpp b/src/runtime/q3dsscenemanager.cpp
index 7ff9d21..9b6fcda 100644
--- a/src/runtime/q3dsscenemanager.cpp
+++ b/src/runtime/q3dsscenemanager.cpp
@@ -5539,9 +5539,16 @@ void Q3DSSceneManager::updateDefaultMaterial(Q3DSDefaultMaterial *m, Q3DSReferen
     // IBL
     if (iblOverride) {
         // also sets min/mag and generates mipmaps
-        Q3DSImageManager::instance().setSource(data->lightProbeOverrideTexture,
-                                               QUrl::fromLocalFile(iblOverride->sourcePath()));
-        data->lightProbeSampler->setValue(QVariant::fromValue(data->lightProbeOverrideTexture));
+        if (!iblOverride->subPresentation().isEmpty()) {
+            if (m_subPresentations.isEmpty())
+                m_pendingSubPresImages.append(qMakePair(data->lightProbeSampler, iblOverride));
+            else
+                setImageTextureFromSubPresentation(data->lightProbeSampler, iblOverride);
+        } else {
+            Q3DSImageManager::instance().setSource(data->lightProbeOverrideTexture,
+                                                   QUrl::fromLocalFile(iblOverride->sourcePath()));
+            data->lightProbeSampler->setValue(QVariant::fromValue(data->lightProbeOverrideTexture));
+        }
 
         Qt3DRender::QTextureWrapMode wrapMode;
         wrapMode.setX(Qt3DRender::QTextureWrapMode::Repeat);