From d39f89d13bab9abeb431eb4d6508300dc82f6c6e Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 21 Apr 2020 16:45:48 +0300 Subject: [PATCH] QmlDesigner: Reset quick3D importer between each file Quick3D importer caches various things when it does the import, making reusing the instance for multiple imports error prone. Change-Id: I6e8e3dedf579683cdda58624172395a392f4e567 Fixes: QDS-1960 Reviewed-by: Thomas Hartmann --- .../components/itemlibrary/itemlibraryassetimporter.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index 0f484a11324..6a5edb18a39 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -315,6 +315,9 @@ void ItemLibraryAssetImporter::parseQuick3DAsset(const QString &file, const QVar return; } + // The importer is reset after every import to avoid issues with it caching various things + m_quick3DAssetImporter.reset(new QSSGAssetImportManager); + if (originalAssetName != assetName) { // Fix the generated qml file name const QString assetQml = originalAssetName + ".qml";