From bcd38707c580148b508ad7a9525099a03017a313 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 29 Jan 2016 21:22:41 +0100 Subject: [PATCH] 3DSConverter: fix level 4 compiler warning. --- code/3DSConverter.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/3DSConverter.cpp b/code/3DSConverter.cpp index 18bb3132e..cea255380 100644 --- a/code/3DSConverter.cpp +++ b/code/3DSConverter.cpp @@ -70,8 +70,9 @@ void Discreet3DSImporter::ReplaceDefaultMaterial() for (unsigned int i = 0; i < mScene->mMaterials.size();++i) { std::string s = mScene->mMaterials[i].mName; - for (std::string::iterator it = s.begin(); it != s.end(); ++it) - *it = ::tolower(*it); + for ( std::string::iterator it = s.begin(); it != s.end(); ++it ) { + *it = static_cast< char >( ::tolower( *it ) ); + } if (std::string::npos == s.find("default"))continue; @@ -663,14 +664,14 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene* pcSOut,aiNode* pcOut, nda->mRotationKeys = new aiQuatKey[nda->mNumRotationKeys]; // Rotations are quaternion offsets - aiQuaternion abs; + aiQuaternion abs1; for (unsigned int n = 0; n < nda->mNumRotationKeys;++n) { const aiQuatKey& q = pcIn->aRotationKeys[n]; - abs = (n ? abs * q.mValue : q.mValue); + abs1 = (n ? abs1 * q.mValue : q.mValue); nda->mRotationKeys[n].mTime = q.mTime; - nda->mRotationKeys[n].mValue = abs.Normalize(); + nda->mRotationKeys[n].mValue = abs1.Normalize(); } }