From a0570efd0bb4f424d763818b5dfca1cffadc6c5c Mon Sep 17 00:00:00 2001
From: Jere Tuliniemi <jere.tuliniemi@qt.io>
Date: Thu, 14 Nov 2019 13:56:24 +0200
Subject: Support LEGACY_ASTC_LOADING with delayed loading
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Images were never loaded if both the legacy flag and delayed loading
were on.

Task-number: QT3DS-3999
Change-Id: I3729c8d111236ed88c2d3db6dadd269cae365f01
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp b/src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
index a5a4e50..76b73dc 100644
--- a/src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
+++ b/src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
@@ -354,7 +354,9 @@ struct SBufferManager : public IBufferManager
             m_reloadableTextures[path]->m_bsdfMipmap = inBsdfMipmaps;
             m_reloadableTextures[path]->m_initialized = true;
 
+#ifndef LEGACY_ASTC_LOADING
             if (!m_reloadableResources)
+#endif
                 loadTextureImage(*m_reloadableTextures[path]);
 
             CRegisteredString imagePath = getImagePath(path);
-- 
cgit v1.2.3