v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build warnings on MSVC14 x64 in the XGL loader.

pull/1083/head
Jared Mulconry 2016-11-27 16:03:25 +11:00
parent 7415289649
commit cf151b77d8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/XGLLoader.cpp
View File

@ -711,7 +711,7 @@ unsigned int XGLImporter::ResolveMaterialRef(TempScope& scope)
const std::string& s = GetElementName(); const std::string& s = GetElementName();
if (s == "mat") { if (s == "mat") {
ReadMaterial(scope); ReadMaterial(scope);
return scope.materials_linear.size()-1; return static_cast<unsigned int>(scope.materials_linear.size()-1);
} }
const int id = ReadIndexFromText(); const int id = ReadIndexFromText();