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:
df6707a
)
Fixed build warnings on MSVC14 x64 in the COB format sources.
author
Jared Mulconry
<j.mulconry@atomizergames.com>
Fri, 18 Nov 2016 15:35:30 +0000
(
02:35
+1100)
committer
Jared Mulconry
<j.mulconry@atomizergames.com>
Fri, 18 Nov 2016 15:35:30 +0000
(
02:35
+1100)
code/COBLoader.cpp
patch
|
blob
|
history
diff --git
a/code/COBLoader.cpp
b/code/COBLoader.cpp
index
4f0ad39
..
441dd1c
100644
(file)
--- a/
code/COBLoader.cpp
+++ b/
code/COBLoader.cpp
@@
-181,7
+181,7
@@
void COBImporter::InternReadFile( const std::string& pFile,
if (n->type == Node::TYPE_MESH) {
Mesh& mesh = (Mesh&)(*n.get());
if (mesh.vertex_positions.size() && mesh.texture_coords.size()) {
- pScene->mNumMeshes +=
mesh.temp_map.size(
);
+ pScene->mNumMeshes +=
static_cast<unsigned int>(mesh.temp_map.size()
);
}
}
}