diff options
Diffstat (limited to 'src/3rdparty/assimp/code/LimitBoneWeightsProcess.cpp')
-rw-r--r-- | src/3rdparty/assimp/code/LimitBoneWeightsProcess.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/3rdparty/assimp/code/LimitBoneWeightsProcess.cpp b/src/3rdparty/assimp/code/LimitBoneWeightsProcess.cpp index e7fd9ab60..0bb4a4be3 100644 --- a/src/3rdparty/assimp/code/LimitBoneWeightsProcess.cpp +++ b/src/3rdparty/assimp/code/LimitBoneWeightsProcess.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, @@ -129,9 +130,9 @@ void LimitBoneWeightsProcess::ProcessMesh( aiMesh* pMesh) std::sort( vit->begin(), vit->end()); // now kill everything beyond the maximum count - unsigned int m = vit->size(); + unsigned int m = static_cast<unsigned int>(vit->size()); vit->erase( vit->begin() + mMaxWeights, vit->end()); - removed += m-vit->size(); + removed += static_cast<unsigned int>(m-vit->size()); // and renormalize the weights float sum = 0.0f; |