Fix GLTFImporter crash on loading second scene

GLTFImporter caches raw pointers, which could very well be invalid
by the time the second load happens, so clear the caches immediately
after the load is finished.

Task-number: QTBUG-57038
Change-Id: I0381f25b08bbbb1a397ba59fe9ef5be8ecbfcc36
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.cpp b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
index 12a475aef..62a309a2f 100644
--- a/src/plugins/sceneparsers/gltf/gltfimporter.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
@@ -236,8 +236,6 @@ bool GLTFImporter::setJSON(const QJsonDocument &json )
     m_json = json;
     m_parseDone = false;
 
-    cleanup();
-
     return true;
 }
 
@@ -469,6 +467,8 @@ Qt3DCore::QEntity* GLTFImporter::scene(const QString &id)
         child->setParent(sceneEntity);
     }
 
+    cleanup();
+
     return sceneEntity;
 }