diff --git a/code/AssetLib/3MF/D3MFImporter.cpp b/code/AssetLib/3MF/D3MFImporter.cpp index fe3c07744..58dde9738 100644 --- a/code/AssetLib/3MF/D3MFImporter.cpp +++ b/code/AssetLib/3MF/D3MFImporter.cpp @@ -123,7 +123,7 @@ void D3MFImporter::InternReadFile(const std::string &filename, aiScene *pScene, XmlParser xmlParser; if (xmlParser.parse(opcPackage.RootStream())) { - XmlSerializer xmlSerializer(&xmlParser, &opcPackage); + XmlSerializer xmlSerializer(&xmlParser); xmlSerializer.ImportXml(pScene); const std::vector &tex = opcPackage.GetEmbeddedTextures(); diff --git a/code/AssetLib/3MF/XmlSerializer.cpp b/code/AssetLib/3MF/XmlSerializer.cpp index daef9a8ac..7a33d08ed 100644 --- a/code/AssetLib/3MF/XmlSerializer.cpp +++ b/code/AssetLib/3MF/XmlSerializer.cpp @@ -193,13 +193,11 @@ void assignDiffuseColor(XmlNode &node, aiMaterial *mat) { } // namespace -XmlSerializer::XmlSerializer(XmlParser *xmlParser, D3MFOpcPackage *archive) : +XmlSerializer::XmlSerializer(XmlParser *xmlParser) : mResourcesDictionnary(), mMeshCount(0), - mXmlParser(xmlParser), - mD3MFOpcPackage(archive) { + mXmlParser(xmlParser) { ai_assert(nullptr != xmlParser); - ai_assert(nullptr != archive); } XmlSerializer::~XmlSerializer() { diff --git a/code/AssetLib/3MF/XmlSerializer.h b/code/AssetLib/3MF/XmlSerializer.h index e6714b250..14da82e99 100644 --- a/code/AssetLib/3MF/XmlSerializer.h +++ b/code/AssetLib/3MF/XmlSerializer.h @@ -60,7 +60,7 @@ class EmbeddedTexture; class XmlSerializer { public: - XmlSerializer(XmlParser *xmlParser, D3MFOpcPackage *archive); + XmlSerializer(XmlParser *xmlParser); ~XmlSerializer(); void ImportXml(aiScene *scene); @@ -90,7 +90,6 @@ private: std::map mResourcesDictionnary; unsigned int mMeshCount; XmlParser *mXmlParser; - D3MFOpcPackage *mD3MFOpcPackage; }; } // namespace D3MF