Merge branch 'master' into fbx_rotation_fix

2020-03-26 21:28:03 +02:00
parent 14b8d1242b da8b174ecb
commit 7f521b4eb4
4 changed files with 33 additions and 2 deletions
@@ -952,8 +952,8 @@ aiNode *ImportNode(aiScene *pScene, glTF2::Asset &r, std::vector<unsigned int> &

 void glTF2Importer::ImportNodes(glTF2::Asset &r) {
 	if (!r.scene) {
-        return;
-    }
+		throw DeadlyImportError("GLTF: No scene");
+	}

 	std::vector<Ref<Node>> rootNodes = r.scene->nodes;

@@ -970,6 +970,8 @@ void glTF2Importer::ImportNodes(glTF2::Asset &r) {
 			root->mChildren[root->mNumChildren++] = node;
 		}
 		mScene->mRootNode = root;
+	} else {
+		mScene->mRootNode = new aiNode("ROOT");
 	}
 }