diff options
Diffstat (limited to 'src/3rdparty/assimp/code/XFileHelper.h')
| -rw-r--r-- | src/3rdparty/assimp/code/XFileHelper.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/3rdparty/assimp/code/XFileHelper.h b/src/3rdparty/assimp/code/XFileHelper.h index 484952106..e7c02c7c6 100644 --- a/src/3rdparty/assimp/code/XFileHelper.h +++ b/src/3rdparty/assimp/code/XFileHelper.h @@ -2,7 +2,8 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. Redistribution and use of this software in source and binary forms, @@ -51,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <assimp/quaternion.h> #include <assimp/mesh.h> #include <assimp/anim.h> -#include "Defines.h" +#include <assimp/Defines.h> namespace Assimp { @@ -82,7 +83,7 @@ struct Material std::string mName; bool mIsReference; // if true, mName holds a name by which the actual material can be found in the material list aiColor4D mDiffuse; - float mSpecularExponent; + ai_real mSpecularExponent; aiColor3D mSpecular; aiColor3D mEmissive; std::vector<TexEntry> mTextures; @@ -100,7 +101,7 @@ struct Material struct BoneWeight { unsigned int mVertex; - float mWeight; + ai_real mWeight; }; /** Helper structure to represent a bone in a mesh */ |