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

Fixed build warnings on MSVC14 x64 in the Material System source.

pull/1083/head
Jared Mulconry 2016-11-20 02:11:01 +11:00
parent 335003a5a3
commit 60cd4605eb
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/MaterialSystem.cpp
View File

@ -529,7 +529,7 @@ aiReturn aiMaterial::AddProperty (const aiString* pInput,
s[1] = static_cast<uint32_t>(pInput->length); s[1] = static_cast<uint32_t>(pInput->length);
return AddBinaryProperty(s+1, return AddBinaryProperty(s+1,
pInput->length+1+4, static_cast<unsigned int>(pInput->length+1+4),
pKey, pKey,
type, type,
index, index,
@ -537,7 +537,7 @@ aiReturn aiMaterial::AddProperty (const aiString* pInput,
} }
ai_assert(sizeof(size_t)==4); ai_assert(sizeof(size_t)==4);
return AddBinaryProperty(pInput, return AddBinaryProperty(pInput,
pInput->length+1+4, static_cast<unsigned int>(pInput->length+1+4),
pKey, pKey,
type, type,
index, index,