From 9dfe7764b22dc47bf60457ccfbc3fbf0e5a7955f Mon Sep 17 00:00:00 2001 From: kimmi Date: Sat, 18 Apr 2009 18:03:54 +0000 Subject: [PATCH] - Fix a compiler warning ( double to float ). git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@392 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/ColladaLoader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index 0c716fd3a..8c31a13e8 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -883,7 +883,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars continue; // resolve the data pointers for all anim channels. Find the minimum time while we're at it - float startTime = 1e20, endTime = -1e20; + float startTime = 1e20f, endTime = -1e20f; for( std::vector::iterator it = entries.begin(); it != entries.end(); ++it) { ChannelEntry& e = *it; @@ -959,7 +959,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars resultTrafos.push_back( mat); // find next point in time to evaluate. That's the closest frame larger than the current in any channel - float nextTime = 1e20; + float nextTime = 1e20f; for( std::vector::iterator it = entries.begin(); it != entries.end(); ++it) { ChannelEntry& e = *it;