浏览代码

Merge branch 'master' into gltfBufferViewSizeFix

Max Vollmer (Microsoft Havok) 5 年之前
父节点
当前提交
c9fb21661f
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      code/AssetLib/Collada/ColladaLoader.cpp

+ 1 - 1
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);
     }
 }