Merge branch 'master' into master

2023-03-23 07:30:49 +01:00
parent 7cc0c06fdb 7437f20d0a
commit 7095c4f52f
2 changed files with 76 additions and 0 deletions
--- a/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
@@ -815,6 +815,7 @@ nl_clean_loop:
            for (; next_it != nodeArray.end(); ++next_it) {
                if ((*next_it)->FindNode((*nl_it)->mName) != nullptr) {
                    // if current top node(nl_it) found in another top node then erase it from node_list and restart search loop.
+                    // FIXME: this leaks memory on test models test8.amf and test9.amf
                    nodeArray.erase(nl_it);

                    goto nl_clean_loop;