Browse Source

Merge branch 'master' into ColladaAnimationFix

Kim Kulling 4 years ago
parent
commit
c9ca921d09
1 changed files with 1 additions and 1 deletions
  1. 1 1
      code/AssetLib/Collada/ColladaLoader.cpp

+ 1 - 1
code/AssetLib/Collada/ColladaLoader.cpp

@@ -982,7 +982,7 @@ void ColladaLoader::StoreAnimations(aiScene *pScene, const ColladaParser &pParse
             animTargets.insert(templateAnim->mChannels[0]->mNodeName.C_Str());
             bool collectedAnimationsHaveDifferentChannels = true;
             for (unsigned long long collectedAnimIndice : collectedAnimIndices) {
-                aiAnimation *srcAnimation = mAnims[collectedAnimIndice];
+                aiAnimation *srcAnimation = mAnims[(int)collectedAnimIndice];
                 std::string channelName = std::string(srcAnimation->mChannels[0]->mNodeName.C_Str());
                 if (animTargets.find(channelName) == animTargets.end()) {
                     animTargets.insert(channelName);