diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2020-04-27 13:42:09 +0300 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2020-04-27 13:50:53 +0300 |
| commit | 6f0ef990df7b230845efcbb94443ecbc7e8e58ba (patch) | |
| tree | 8ee4cc3b3ee64a6902b7c16bff3c983602376f71 | |
| parent | e2c3ae53ddc0d0a5a5b0b6c76e427689d0b2d826 (diff) | |
Don't try to load images with a subpresentation id as the path
Custom materials using subpresentations would have their textures loaded
as images and failing because of the invalid path.
Task-number: QT3DS-4094
Change-Id: Iadcf5237dc26c5666c8b54cdee0fed3a01434d77
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | src/runtimerender/graphobjects/Qt3DSRenderImage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp b/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp index 69cc35b..4044976 100644 --- a/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp +++ b/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp @@ -95,7 +95,8 @@ bool SImage::ClearDirty(IBufferManager &inBufferManager, IOffscreenRenderManager if (newImage.m_Texture == nullptr) { m_LastFrameOffscreenRenderer = nullptr; - if (m_ImagePath.IsValid() && !m_OffscreenRendererId.IsValid()) { + if (m_ImagePath.IsValid() && !m_OffscreenRendererId.IsValid() + && !inRenderManager.HasOffscreenRenderer(m_ImagePath)) { // Image has sourcepath set if (!m_LoadedTextureData || m_LoadedTextureData->m_path != QString::fromUtf8(m_ImagePath.c_str())) { |