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

- fbx: 32 bit build fixes.

pull/14/head
Alexander Gessler 2012-08-10 23:26:49 +02:00
parent 315285faf0
commit 8d5b78c035
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/FBXConverter.cpp
View File

@ -1108,7 +1108,7 @@ private:
{ {
// locate source materials for this mesh // locate source materials for this mesh
const std::vector<const Material*>& mats = model.GetMaterials(); const std::vector<const Material*>& mats = model.GetMaterials();
if (materialIndex >= mats.size() || materialIndex < 0) { if (static_cast<unsigned int>(materialIndex) >= mats.size() || materialIndex < 0) {
FBXImporter::LogError("material index out of bounds, setting default material"); FBXImporter::LogError("material index out of bounds, setting default material");
out->mMaterialIndex = GetDefaultMaterial(); out->mMaterialIndex = GetDefaultMaterial();
return; return;

2
code/FBXParser.cpp
View File

@ -311,7 +311,7 @@ size_t ParseTokenAsDim(const Token& t, const char*& err_out)
ai_assert(t.end() - data == 9); ai_assert(t.end() - data == 9);
BE_NCONST uint64_t id = *reinterpret_cast<const uint64_t*>(data+1); BE_NCONST uint64_t id = *reinterpret_cast<const uint64_t*>(data+1);
AI_SWAP8(id); AI_SWAP8(id);
return id; return static_cast<size_t>(id);
} }
if(*t.begin() != '*') { if(*t.begin() != '*') {