diff options
| author | Mike Krus <mike.krus@kdab.com> | 2018-04-04 09:53:27 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2018-04-09 11:51:08 +0000 |
| commit | 5247d7146c65672bd245ceb0dc213dfb319919c4 (patch) | |
| tree | 87159d0f24af725bb7c01c7495d71b3cc4bc76c2 /src/3rdparty/assimp/code/FBXModel.cpp | |
| parent | af4972fd15e6b11a99c631ff91b3360ceb8be5cc (diff) | |
Update Assimp to 4.1
Fixes build with C++17 / XCode 9.3
Change-Id: Ic1c19cc4b86e54e72dd4cfe054ec6d66f64b5a07
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/3rdparty/assimp/code/FBXModel.cpp')
| -rw-r--r-- | src/3rdparty/assimp/code/FBXModel.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/3rdparty/assimp/code/FBXModel.cpp b/src/3rdparty/assimp/code/FBXModel.cpp index bbeb14bfb..3d694d7d8 100644 --- a/src/3rdparty/assimp/code/FBXModel.cpp +++ b/src/3rdparty/assimp/code/FBXModel.cpp @@ -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, @@ -48,9 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FBXMeshGeometry.h" #include "FBXDocument.h" #include "FBXImporter.h" -#include "FBXImportSettings.h" #include "FBXDocumentUtil.h" -#include "FBXProperties.h" namespace Assimp { namespace FBX { @@ -78,14 +77,12 @@ Model::Model(uint64_t id, const Element& element, const Document& doc, const std ResolveLinks(element,doc); } - // ------------------------------------------------------------------------------------------------ Model::~Model() { } - // ------------------------------------------------------------------------------------------------ void Model::ResolveLinks(const Element& element, const Document& doc) { @@ -133,7 +130,6 @@ void Model::ResolveLinks(const Element& element, const Document& doc) } } - // ------------------------------------------------------------------------------------------------ bool Model::IsNull() const { |