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:
2866da1
)
Fixed build warnings on MSVC14 x64 in the Collada parser.
author
Jared Mulconry
<j.mulconry@atomizergames.com>
Fri, 18 Nov 2016 15:42:51 +0000
(
02:42
+1100)
committer
Jared Mulconry
<j.mulconry@atomizergames.com>
Fri, 18 Nov 2016 15:42:51 +0000
(
02:42
+1100)
code/ColladaParser.cpp
patch
|
blob
|
history
diff --git
a/code/ColladaParser.cpp
b/code/ColladaParser.cpp
index
1fd762e
..
fe2f047
100644
(file)
--- a/
code/ColladaParser.cpp
+++ b/
code/ColladaParser.cpp
@@
-2535,7
+2535,7
@@
void ColladaParser::ExtractDataObjectFromChannel( const InputChannel& pInput, si
aiColor4D result(0, 0, 0, 1);
for (size_t i = 0; i < pInput.mResolved->mSize; ++i)
{
- result[
i
] = obj[pInput.mResolved->mSubOffset[i]];
+ result[
static_cast<unsigned int>(i)
] = obj[pInput.mResolved->mSubOffset[i]];
}
pMesh->mColors[pInput.mIndex].push_back(result);
} else