v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build warnings on MSVC14 x64 in Target Animation source.

pull/1083/head
Jared Mulconry 2016-11-27 14:35:49 +11:00
parent 2d563180ac
commit 39f54bf183
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/TargetAnimation.cpp
View File

@ -100,8 +100,8 @@ void KeyIterator::operator ++()
// to our current position on the time line // to our current position on the time line
double d0,d1; double d0,d1;
d0 = objPos->at ( std::min<unsigned int> ( nextObjPos, objPos->size()-1) ).mTime; d0 = objPos->at ( std::min ( nextObjPos, static_cast<unsigned int>(objPos->size()-1)) ).mTime;
d1 = targetObjPos->at( std::min<unsigned int> ( nextTargetObjPos, targetObjPos->size()-1) ).mTime; d1 = targetObjPos->at( std::min ( nextTargetObjPos, static_cast<unsigned int>(targetObjPos->size()-1)) ).mTime;
// Easiest case - all are identical. In this // Easiest case - all are identical. In this
// case we don't need to interpolate so we can // case we don't need to interpolate so we can