Merge branch 'master' into update_copyrights

2021-02-28 12:18:41 +01:00
parent 9e8dbd0ca5 9336341eac
commit c669c8f1eb
438 changed files with 57029 additions and 221 deletions
--- a/code/AssetLib/3MF/D3MFImporter.cpp
+++ b/code/AssetLib/3MF/D3MFImporter.cpp
@@ -427,7 +427,7 @@ private:
                aiFace face = ReadTriangle(currentNode);
                faces.push_back(face);

-                int pid, p1;
+                int pid = 0, p1;
                bool hasPid = getNodeAttribute(currentNode, D3MF::XmlTag::pid, pid);
                bool hasP1 = getNodeAttribute(currentNode, D3MF::XmlTag::p1, p1);