Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml

Browse Source
This commit is contained in:
kimkulling
2020-09-22 15:20:35 +02:00
parent 8c88526da8 c4039d5cf0
commit dee8e5bee1
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/AssetLib/Collada/ColladaParser.cpp
View File

@@ -256,6 +256,7 @@ void ColladaParser::ReadContents(XmlNode &node) {
void ColladaParser::ReadStructure(XmlNode &node) {
for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
const std::string name = std::string(currentNode.name());
ASSIMP_LOG_DEBUG("last name" + name);
if (name == "asset")
ReadAssetInfo(currentNode);
else if (name == "library_animations")
@@ -405,7 +406,7 @@ void ColladaParser::PostProcessControllers() {
for (ControllerLibrary::iterator it = mControllerLibrary.begin(); it != mControllerLibrary.end(); ++it) {
meshId = it->second.mMeshId;
if (meshId.empty()) {
break;
continue;
}
ControllerLibrary::iterator findItr = mControllerLibrary.find(meshId);