Explorar el Código

Merge branch 'master' into gltfBufferViewSizeFix

Max Vollmer (Microsoft Havok) hace 5 años
padre
commit
c9fb21661f
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  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) {
         for (size_t a = 0; a < morphAnims.size(); ++a) {
             anim->mDuration = std::max(anim->mDuration, morphAnims[a]->mKeys[morphAnims[a]->mNumKeys - 1].mTime);
             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);
         mAnims.push_back(anim);
     }
     }
 }
 }