From e3d7ca264c79f689878ce469c35f23a00e3bdf63 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 15 Mar 2016 19:28:57 +0100 Subject: [PATCH] Collada: reset workaround. --- code/ColladaLoader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index d423fbd2e..e6dd3ecad 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -1174,7 +1174,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars // https://github.com/assimp/assimp/issues/458 // Sub-sample axis-angle channels if the delta between two consecutive // key-frame angles is >= 180 degrees. - /*if (transforms[e.mTransformIndex].mType == Collada::TF_ROTATE && e.mSubElement == 3 && pos > 0 && pos < e.mTimeAccessor->mCount) { + if (transforms[e.mTransformIndex].mType == Collada::TF_ROTATE && e.mSubElement == 3 && pos > 0 && pos < e.mTimeAccessor->mCount) { float cur_key_angle = ReadFloat(*e.mValueAccessor, *e.mValueData, pos, 0); float last_key_angle = ReadFloat(*e.mValueAccessor, *e.mValueData, pos - 1, 0); float cur_key_time = ReadFloat(*e.mTimeAccessor, *e.mTimeData, pos, 0); @@ -1188,7 +1188,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars nextTime = std::min(nextTime, nextSampleTime); } } - }*/ + } } // no more keys on any channel after the current time -> we're done