|
@@ -250,7 +250,7 @@ void XGLImporter::ReadWorld(XmlNode &node, TempScope &scope) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- aiNode *const nd = ReadObject(node, scope, true);
|
|
|
|
|
|
+ aiNode *const nd = ReadObject(node, scope);
|
|
if (!nd) {
|
|
if (!nd) {
|
|
ThrowException("failure reading <world>");
|
|
ThrowException("failure reading <world>");
|
|
}
|
|
}
|
|
@@ -296,16 +296,13 @@ aiLight *XGLImporter::ReadDirectionalLight(XmlNode &node) {
|
|
}
|
|
}
|
|
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
// ------------------------------------------------------------------------------------------------
|
|
-aiNode *XGLImporter::ReadObject(XmlNode &node, TempScope &scope, bool skipFirst/*, const char *closetag */) {
|
|
|
|
|
|
+aiNode *XGLImporter::ReadObject(XmlNode &node, TempScope &scope) {
|
|
aiNode *nd = new aiNode;
|
|
aiNode *nd = new aiNode;
|
|
std::vector<aiNode *> children;
|
|
std::vector<aiNode *> children;
|
|
std::vector<unsigned int> meshes;
|
|
std::vector<unsigned int> meshes;
|
|
|
|
|
|
try {
|
|
try {
|
|
for (XmlNode &child : node.children()) {
|
|
for (XmlNode &child : node.children()) {
|
|
-
|
|
|
|
- skipFirst = false;
|
|
|
|
-
|
|
|
|
const std::string &s = ai_stdStrToLower(child.name());
|
|
const std::string &s = ai_stdStrToLower(child.name());
|
|
if (s == "mesh") {
|
|
if (s == "mesh") {
|
|
const size_t prev = scope.meshes_linear.size();
|
|
const size_t prev = scope.meshes_linear.size();
|