Merge branch 'master' into fix/multibody-binary-stls

2017-11-30 00:28:59 +01:00
parent 67c236647d 9d224f6ac5
commit 9be69a90b1
3 changed files with 13 additions and 1 deletions
--- a/code/glTF2Importer.cpp
+++ b/code/glTF2Importer.cpp
@@ -516,7 +516,9 @@ aiNode* ImportNode(aiScene* pScene, glTF2::Asset& r, std::vector<unsigned int>&
 {
    Node& node = *ptr;

-    aiNode* ainode = new aiNode(node.name);
+    std::string nameOrId = node.name.empty() ? node.id : node.name;
+
+    aiNode* ainode = new aiNode(nameOrId);

    if (!node.children.empty()) {
        ainode->mNumChildren = unsigned(node.children.size());