diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-11-14 13:56:24 +0200 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-11-20 16:08:50 +0200 |
| commit | a0570efd0bb4f424d763818b5dfca1cffadc6c5c (patch) | |
| tree | 54961465596001e1670dadb5a226771e70c46377 | |
| parent | 92b074b535a2c7bad64f012b829d3651de555209 (diff) | |
Support LEGACY_ASTC_LOADING with delayed loading
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>
| -rw-r--r-- | src/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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); |