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

Merge pull request #800 from pkholland/master 

Can't add integer to string pointer
pull/846/head
Kim Kulling 2016-04-01 10:01:23 +02:00
parent 49d60dc856 f20a5afcf0
commit d094dfc3a1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ColladaParser.cpp
View File

@ -297,7 +297,7 @@ void ColladaParser::ReadAnimationClipLibrary()
else if (indexID >= 0) else if (indexID >= 0)
animName = mReader->getAttributeValue(indexID); animName = mReader->getAttributeValue(indexID);
else else
animName = "animation_" + mAnimationClipLibrary.size(); animName = std::string("animation_") + std::to_string(mAnimationClipLibrary.size());
std::pair<std::string, std::vector<std::string> > clip; std::pair<std::string, std::vector<std::string> > clip;