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/glTFImporter.h | |
| 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/glTFImporter.h')
| -rw-r--r-- | src/3rdparty/assimp/code/glTFImporter.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/assimp/code/glTFImporter.h b/src/3rdparty/assimp/code/glTFImporter.h index 5d06730a5..46f450f86 100644 --- a/src/3rdparty/assimp/code/glTFImporter.h +++ b/src/3rdparty/assimp/code/glTFImporter.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, @@ -41,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_GLTFIMPORTER_H_INC #include "BaseImporter.h" -#include "DefaultIOSystem.h" +#include <assimp/DefaultIOSystem.h> struct aiNode; |