diff options
Diffstat (limited to 'src/3rdparty/assimp/code/LWSLoader.cpp')
| -rw-r--r-- | src/3rdparty/assimp/code/LWSLoader.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/3rdparty/assimp/code/LWSLoader.cpp b/src/3rdparty/assimp/code/LWSLoader.cpp index a81c15a6e..2017cdb9d 100644 --- a/src/3rdparty/assimp/code/LWSLoader.cpp +++ b/src/3rdparty/assimp/code/LWSLoader.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. @@ -50,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ParsingUtils.h" #include "fast_atof.h" -#include "SceneCombiner.h" +#include <assimp/SceneCombiner.h> #include "GenericProperty.h" #include "SkeletonMeshBuilder.h" #include "ConvertToLHProcess.h" @@ -58,9 +59,9 @@ 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 <memory> - using namespace Assimp; static const aiImporterDesc desc = { @@ -470,7 +471,7 @@ void LWSImporter::BuildGraph(aiNode* nd, LWS::NodeDesc& src, std::vector<Attachm // Determine the exact location of a LWO file std::string LWSImporter::FindLWOFile(const std::string& in) { - // insert missing directory seperator if necessary + // insert missing directory separator if necessary std::string tmp; if (in.length() > 3 && in[1] == ':'&& in[2] != '\\' && in[2] != '/') { @@ -902,7 +903,7 @@ void LWSImporter::InternReadFile( const std::string& pFile, aiScene* pScene, anim->mTicksPerSecond = fps; anim->mDuration = last-(first-1); /* fixme ... zero or one-based?*/ - anim->mChannels = new aiNodeAnim*[anim->mNumChannels = anims.size()]; + anim->mChannels = new aiNodeAnim*[anim->mNumChannels = static_cast<unsigned int>(anims.size())]; std::copy(anims.begin(),anims.end(),anim->mChannels); } |