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:
2c93e29
)
Fixed build warnings on MSVC14 x64 in the LWS format sources.
author
Jared Mulconry
<j.mulconry@atomizergames.com>
Sat, 19 Nov 2016 15:03:53 +0000
(
02:03
+1100)
committer
Jared Mulconry
<j.mulconry@atomizergames.com>
Sat, 19 Nov 2016 15:03:53 +0000
(
02:03
+1100)
code/LWSLoader.cpp
patch
|
blob
|
history
diff --git
a/code/LWSLoader.cpp
b/code/LWSLoader.cpp
index
a81c15a
..
6ca3cf5
100644
(file)
--- a/
code/LWSLoader.cpp
+++ b/
code/LWSLoader.cpp
@@
-902,7
+902,7
@@
void LWSImporter::InternReadFile( const std::string& pFile, aiScene* pScene,
anim->mTicksPerSecond = fps;
anim->mDuration = last-(first-1); /* fixme ... zero or one-based?*/
- anim->mChannels = new aiNodeAnim*[anim->mNumChannels =
anims.size(
)];
+ anim->mChannels = new aiNodeAnim*[anim->mNumChannels =
static_cast<unsigned int>(anims.size()
)];
std::copy(anims.begin(),anims.end(),anim->mChannels);
}