diff options
| author | Kaj Grönholm <kaj.gronholm@qt.io> | 2019-08-05 10:28:40 +0300 |
|---|---|---|
| committer | Kaj Grönholm <kaj.gronholm@qt.io> | 2019-08-06 08:19:52 +0300 |
| commit | 6213b3791fb1b85d5f76fd68bac4b5b3c56eef55 (patch) | |
| tree | b35409eee68aa55e7180adb6bc80e4f01109e1dd /src/runtimerender/graphobjects | |
| parent | 3bcd2a4e81ffced186b060de8eee905b5c65f780 (diff) | |
Ignore sourcepath when subpresentation is set
When UIP image has subpresentation set, don't try to load sourcepath
as it contains same subpresentation ID and fails with a warning.
Task-number: QT3DS-3723
Change-Id: I8d5a5045a78828e74f7bf7d81c1feecd75900e00
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/runtimerender/graphobjects')
| -rw-r--r-- | src/runtimerender/graphobjects/Qt3DSRenderImage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp b/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp index 57e86ad..f91fb65 100644 --- a/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp +++ b/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp @@ -86,6 +86,7 @@ bool SImage::ClearDirty(IBufferManager &inBufferManager, IOffscreenRenderManager if (newImage.m_Texture == nullptr) { if (m_OffscreenRendererId.IsValid()) { + // Image has subpresentation set SOffscreenRenderResult theResult = inRenderManager.GetRenderedItem(m_OffscreenRendererId); HandleOffscreenResult(*this, newImage, theResult, replaceTexture, wasDirty); @@ -94,7 +95,8 @@ bool SImage::ClearDirty(IBufferManager &inBufferManager, IOffscreenRenderManager if (newImage.m_Texture == nullptr) { m_LastFrameOffscreenRenderer = nullptr; - if (m_ImagePath.IsValid()) { + if (m_ImagePath.IsValid() && !m_OffscreenRendererId.IsValid()) { + // Image has sourcepath set if (!m_LoadedTextureData || m_LoadedTextureData->m_path != QString::fromUtf8(m_ImagePath.c_str())) { if (m_LoadedTextureData) |