summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2019-05-13 08:24:18 +0300
committerAntti Määttä <antti.maatta@qt.io>2019-05-13 08:02:06 +0000
commit7da6bc8b295728957d548a6cfe3c78ce07bb0fb5 (patch)
tree1f8f7721a01e8c128b261f6e609d7257f8bed33f
parent157203bb9ca72793e7ff69e55f7aaed35dca584e (diff)
Fix crash in editor when changing presentations
Reloadable textures must be cleared when buffer manager is cleared. Task-number: QT3DS-3403 Change-Id: Ia0bd6e08fbf50d527a9e8ab2d4a4336c891229b5 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
index 15cf7323..74e55d79 100644
--- a/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
+++ b/src/Runtime/Source/runtimerender/resourcemanager/Qt3DSRenderBufferManager.cpp
@@ -1010,6 +1010,7 @@ struct SBufferManager : public IBufferManager
}
void Clear() override
{
+ m_reloadableTextures.clear();
for (TMeshMap::iterator iter = m_MeshMap.begin(), end = m_MeshMap.end(); iter != end;
++iter) {
SRenderMesh *theMesh = iter->second;