projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
335003a
)
Fixed build warnings on MSVC14 x64 in the Material System source.
author
Jared Mulconry
<j.mulconry@atomizergames.com>
Sat, 19 Nov 2016 15:11:01 +0000
(
02:11
+1100)
committer
Jared Mulconry
<j.mulconry@atomizergames.com>
Sat, 19 Nov 2016 15:11:01 +0000
(
02:11
+1100)
code/MaterialSystem.cpp
patch
|
blob
|
history
diff --git
a/code/MaterialSystem.cpp
b/code/MaterialSystem.cpp
index
21cd38f
..
5fcf28a
100644
(file)
--- a/
code/MaterialSystem.cpp
+++ b/
code/MaterialSystem.cpp
@@
-529,7
+529,7
@@
aiReturn aiMaterial::AddProperty (const aiString* pInput,
s[1] = static_cast<uint32_t>(pInput->length);
return AddBinaryProperty(s+1,
-
pInput->length+1+4
,
+
static_cast<unsigned int>(pInput->length+1+4)
,
pKey,
type,
index,
@@
-537,7
+537,7
@@
aiReturn aiMaterial::AddProperty (const aiString* pInput,
}
ai_assert(sizeof(size_t)==4);
return AddBinaryProperty(pInput,
-
pInput->length+1+4
,
+
static_cast<unsigned int>(pInput->length+1+4)
,
pKey,
type,
index,