Merge branch 'master' into kimkulling/fix_invalid_delete_issue-5307

Remove double delete
2023-11-14 21:59:46 +01:00 · 2023-11-14 21:58:39 +01:00
1 changed files with 0 additions and 3 deletions
--- a/code/AssetLib/3MF/D3MFOpcPackage.cpp
+++ b/code/AssetLib/3MF/D3MFOpcPackage.cpp
@ -186,9 +186,6 @@ D3MFOpcPackage::D3MFOpcPackage(IOSystem *pIOHandler, const std::string &rFile) :
 D3MFOpcPackage::~D3MFOpcPackage() {
    mZipArchive->Close(mRootStream);
    delete mZipArchive;
    for (auto tex : mEmbeddedTextures) {
        delete tex;
    }
 }
 IOStream *D3MFOpcPackage::RootStream() const {
Author	SHA1	Message	Date
Kim Kulling	3c18be8747	Merge branch 'master' into kimkulling/fix_invalid_delete_issue-5307	2023-11-14 21:59:46 +01:00
Kim Kulling	35a2d9982a	Remove double delete	2023-11-14 21:58:39 +01:00