Merge branch 'master' into gltfBufferViewSizeFix

2020-09-18 08:01:24 +01:00 · 2020-09-18 08:01:24 +01:00 · c9fb21661f
parent 9c1edaee96 fbc0914a21
commit c9fb21661f
1 changed files with 1 additions and 1 deletions
--- a/code/AssetLib/Collada/ColladaLoader.cpp
+++ b/code/AssetLib/Collada/ColladaLoader.cpp
@ -1468,7 +1468,7 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
        for (size_t a = 0; a < morphAnims.size(); ++a) {
            anim->mDuration = std::max(anim->mDuration, morphAnims[a]->mKeys[morphAnims[a]->mNumKeys - 1].mTime);
        }
-        anim->mTicksPerSecond = 1;
+        anim->mTicksPerSecond = 1000.0;
        mAnims.push_back(anim);
    }
 }