summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/assimp/code/OgreXmlSerializer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/assimp/code/OgreXmlSerializer.cpp')
-rw-r--r--src/3rdparty/assimp/code/OgreXmlSerializer.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/3rdparty/assimp/code/OgreXmlSerializer.cpp b/src/3rdparty/assimp/code/OgreXmlSerializer.cpp
index 494d8e00c..b5d20cdf6 100644
--- a/src/3rdparty/assimp/code/OgreXmlSerializer.cpp
+++ b/src/3rdparty/assimp/code/OgreXmlSerializer.cpp
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -623,7 +624,7 @@ void OgreXmlSerializer::ReadSubMesh(MeshXml *mesh)
SkipCurrentNode();
}
- submesh->index = mesh->subMeshes.size();
+ submesh->index = static_cast<unsigned int>(mesh->subMeshes.size());
mesh->subMeshes.push_back(submesh);
}
@@ -654,7 +655,7 @@ void OgreXmlSerializer::ReadBoneAssignments(VertexDataXml *dest)
}
/** Normalize bone weights.
- Some exporters wont care if the sum of all bone weights
+ Some exporters won't care if the sum of all bone weights
for a single vertex equals 1 or not, so validate here. */
const float epsilon = 0.05f;
for (const uint32_t vertexIndex : influencedVertices)