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:
d16b895
)
Fixed build warnings on MSVC14 x64 in the CSM loader.
author
Jared Mulconry
<j.mulconry@atomizergames.com>
Fri, 18 Nov 2016 16:29:47 +0000
(
03:29
+1100)
committer
Jared Mulconry
<j.mulconry@atomizergames.com>
Fri, 18 Nov 2016 16:29:47 +0000
(
03:29
+1100)
code/CSMLoader.cpp
patch
|
blob
|
history
diff --git
a/code/CSMLoader.cpp
b/code/CSMLoader.cpp
index
925abf4
..
5f274c5
100644
(file)
--- a/
code/CSMLoader.cpp
+++ b/
code/CSMLoader.cpp
@@
-179,7
+179,7
@@
void CSMImporter::InternReadFile( const std::string& pFile,
nda->mNodeName.length = (size_t)(ot-nda->mNodeName.data);
}
- anim->mNumChannels =
anims_temp.size(
);
+ anim->mNumChannels =
static_cast<unsigned int>(anims_temp.size()
);
if (!anim->mNumChannels)
throw DeadlyImportError("CSM: Empty $order section");