v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into issue_2195_draco

pull/3614/head
Kim Kulling 2021-02-10 15:28:39 +01:00 committed by GitHub
parent 888415246e 2cb0304e71
commit 426c1a340f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,17 +529,17 @@ void ColladaParser::ReadAnimation(XmlNode &node, Collada::Animation *pParent) {
// have it read into a channel // have it read into a channel
ChannelMap::iterator newChannel = channels.insert(std::make_pair(id, AnimationChannel())).first; ChannelMap::iterator newChannel = channels.insert(std::make_pair(id, AnimationChannel())).first;
ReadAnimationSampler(currentNode, newChannel->second); ReadAnimationSampler(currentNode, newChannel->second);
} else if (currentName == "channel") { }
std::string source_name, target; } else if (currentName == "channel") {
XmlParser::getStdStrAttribute(currentNode, "source", source_name); std::string source_name, target;
XmlParser::getStdStrAttribute(currentNode, "target", target); XmlParser::getStdStrAttribute(currentNode, "source", source_name);
if (source_name[0] == '#') { XmlParser::getStdStrAttribute(currentNode, "target", target);
source_name = source_name.substr(1, source_name.size() - 1); if (source_name[0] == '#') {
} source_name = source_name.substr(1, source_name.size() - 1);
ChannelMap::iterator cit = channels.find(source_name); }
if (cit != channels.end()) { ChannelMap::iterator cit = channels.find(source_name);
cit->second.mTarget = target; if (cit != channels.end()) {
} cit->second.mTarget = target;
} }
} }
} }