diff options
Diffstat (limited to 'src/3rdparty/assimp/code/MS3DLoader.cpp')
| -rw-r--r-- | src/3rdparty/assimp/code/MS3DLoader.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/3rdparty/assimp/code/MS3DLoader.cpp b/src/3rdparty/assimp/code/MS3DLoader.cpp index ef16a756a..64ec1e076 100644 --- a/src/3rdparty/assimp/code/MS3DLoader.cpp +++ b/src/3rdparty/assimp/code/MS3DLoader.cpp @@ -3,7 +3,8 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. @@ -53,7 +54,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <assimp/DefaultLogger.hpp> #include <assimp/scene.h> #include <assimp/IOSystem.hpp> - +#include <assimp/importerdesc.h> +#include <map> using namespace Assimp; @@ -423,7 +425,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile, for (unsigned int i = 0; i < groups.size(); ++i) { TempGroup& g = groups[i]; if (g.mat == UINT_MAX) { - g.mat = materials.size()-1; + g.mat = static_cast<unsigned int>(materials.size()-1); } } } @@ -483,7 +485,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile, m->mMaterialIndex = g.mat; m->mPrimitiveTypes = aiPrimitiveType_TRIANGLE; - m->mFaces = new aiFace[m->mNumFaces = g.triangles.size()]; + m->mFaces = new aiFace[m->mNumFaces = static_cast<unsigned int>(g.triangles.size())]; m->mNumVertices = m->mNumFaces*3; // storage for vertices - verbose format, as requested by the postprocessing pipeline |