Merge branch 'master' into verboseLogging

2020-05-21 18:30:52 +02:00
parent 14692368d5 f940a37be6
commit ecfca1d5c5
78 changed files with 715 additions and 204 deletions
--- a/code/AssetLib/Collada/ColladaParser.cpp
+++ b/code/AssetLib/Collada/ColladaParser.cpp
@@ -2479,7 +2479,7 @@ void ColladaParser::ReadSceneLibrary() {

                // read name if given.
                int indexName = TestAttribute("name");
-                const char *attrName = "unnamed";
+                const char *attrName = "Scene";
                if (indexName > -1)
                    attrName = mReader->getAttributeValue(indexName);