diff options
Diffstat (limited to 'src/3rdparty/assimp/code/CSMLoader.cpp')
-rw-r--r-- | src/3rdparty/assimp/code/CSMLoader.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/3rdparty/assimp/code/CSMLoader.cpp b/src/3rdparty/assimp/code/CSMLoader.cpp index 925abf4bd..eeb6986b0 100644 --- a/src/3rdparty/assimp/code/CSMLoader.cpp +++ b/src/3rdparty/assimp/code/CSMLoader.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. @@ -57,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <assimp/anim.h> #include <assimp/DefaultLogger.hpp> #include <assimp/scene.h> - +#include <assimp/importerdesc.h> using namespace Assimp; @@ -179,7 +180,7 @@ void CSMImporter::InternReadFile( const std::string& pFile, nda->mNodeName.length = (size_t)(ot-nda->mNodeName.data); } - anim->mNumChannels = anims_temp.size(); + anim->mNumChannels = static_cast<unsigned int>(anims_temp.size()); if (!anim->mNumChannels) throw DeadlyImportError("CSM: Empty $order section"); |