diff options
Diffstat (limited to 'src/3rdparty/assimp/code/BVHLoader.cpp')
| -rw-r--r-- | src/3rdparty/assimp/code/BVHLoader.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/assimp/code/BVHLoader.cpp b/src/3rdparty/assimp/code/BVHLoader.cpp index ca6c5d36c..c20cbec4e 100644 --- a/src/3rdparty/assimp/code/BVHLoader.cpp +++ b/src/3rdparty/assimp/code/BVHLoader.cpp @@ -4,7 +4,8 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. @@ -51,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "TinyFormatter.h" #include <assimp/IOSystem.hpp> #include <assimp/scene.h> +#include <assimp/importerdesc.h> using namespace Assimp; using namespace Assimp::Formatter; @@ -237,7 +239,7 @@ aiNode* BVHLoader::ReadNode() // add the child nodes if there are any if( childNodes.size() > 0) { - node->mNumChildren = childNodes.size(); + node->mNumChildren = static_cast<unsigned int>(childNodes.size()); node->mChildren = new aiNode*[node->mNumChildren]; std::copy( childNodes.begin(), childNodes.end(), node->mChildren); } @@ -443,7 +445,7 @@ void BVHLoader::CreateAnimation( aiScene* pScene) anim->mDuration = double( mAnimNumFrames - 1); // now generate the tracks for all nodes - anim->mNumChannels = mNodes.size(); + anim->mNumChannels = static_cast<unsigned int>(mNodes.size()); anim->mChannels = new aiNodeAnim*[anim->mNumChannels]; // FIX: set the array elements to NULL to ensure proper deletion if an exception is thrown |