Merge branch 'master' into issue_1758

2018-02-02 20:36:40 +01:00 · 2018-02-02 20:36:40 +01:00 · 9740243e6b
parent 84957faa16 7ca8407ef2
commit 9740243e6b
617 changed files with 29053 additions and 652 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,7 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
-# Copyright (c) 2006-2017, assimp team
+# Copyright (c) 2006-2018, assimp team
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms,
--- a/code/3DSConverter.cpp
+++ b/code/3DSConverter.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/3DSExporter.cpp
+++ b/code/3DSExporter.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/3DSExporter.h
+++ b/code/3DSExporter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/3DSHelper.h
+++ b/code/3DSHelper.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/3DSLoader.cpp
+++ b/code/3DSLoader.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/3DSLoader.h
+++ b/code/3DSLoader.h
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/3MFXmlTags.h
+++ b/code/3MFXmlTags.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ACLoader.cpp
+++ b/code/ACLoader.cpp
@ -4,7 +4,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ACLoader.h
+++ b/code/ACLoader.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AMFImporter.cpp
+++ b/code/AMFImporter.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AMFImporter.hpp
+++ b/code/AMFImporter.hpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AMFImporter_Geometry.cpp
+++ b/code/AMFImporter_Geometry.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AMFImporter_Macro.hpp
+++ b/code/AMFImporter_Macro.hpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AMFImporter_Material.cpp
+++ b/code/AMFImporter_Material.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AMFImporter_Node.hpp
+++ b/code/AMFImporter_Node.hpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AMFImporter_Postprocess.cpp
+++ b/code/AMFImporter_Postprocess.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ASELoader.cpp
+++ b/code/ASELoader.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ASELoader.h
+++ b/code/ASELoader.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ASEParser.cpp
+++ b/code/ASEParser.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ASEParser.h
+++ b/code/ASEParser.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AssbinExporter.cpp
+++ b/code/AssbinExporter.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
@ -41,6 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  AssbinExporter.cpp
 *  ASSBIN exporter main code
 */
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_ASSBIN_EXPORTER
 #include "assbin_chunks.h"
 #include <assimp/version.h>
 #include <assimp/IOStream.hpp>
@ -57,10 +62,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <time.h>
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_ASSBIN_EXPORTER
 using namespace Assimp;
 namespace Assimp    {
--- a/code/AssbinExporter.h
+++ b/code/AssbinExporter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AssbinLoader.cpp
+++ b/code/AssbinLoader.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AssbinLoader.h
+++ b/code/AssbinLoader.h
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/Assimp.cpp
+++ b/code/Assimp.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AssimpCExport.cpp
+++ b/code/AssimpCExport.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/AssxmlExporter.cpp
+++ b/code/AssxmlExporter.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
@ -41,6 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  AssxmlExporter.cpp
 *  ASSXML exporter main code
 */
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_ASSXML_EXPORTER
 #include <stdarg.h>
 #include <assimp/version.h>
 #include "ProcessHelper.h"
@ -57,9 +62,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <time.h>
 #include <stdio.h>
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_ASSXML_EXPORTER
 using namespace Assimp;
 namespace Assimp    {
--- a/code/AssxmlExporter.h
+++ b/code/AssxmlExporter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/B3DImporter.cpp
+++ b/code/B3DImporter.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/B3DImporter.h
+++ b/code/B3DImporter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BVHLoader.cpp
+++ b/code/BVHLoader.cpp
@ -4,7 +4,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BVHLoader.h
+++ b/code/BVHLoader.h
@ -4,7 +4,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BaseImporter.cpp
+++ b/code/BaseImporter.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BaseProcess.cpp
+++ b/code/BaseProcess.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BaseProcess.h
+++ b/code/BaseProcess.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/Bitmap.cpp
+++ b/code/Bitmap.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderDNA.cpp
+++ b/code/BlenderDNA.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderDNA.h
+++ b/code/BlenderDNA.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderDNA.inl
+++ b/code/BlenderDNA.inl
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderIntermediate.h
+++ b/code/BlenderIntermediate.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderLoader.cpp
+++ b/code/BlenderLoader.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderLoader.h
+++ b/code/BlenderLoader.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderModifier.cpp
+++ b/code/BlenderModifier.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderModifier.h
+++ b/code/BlenderModifier.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderScene.h
+++ b/code/BlenderScene.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderTessellator.cpp
+++ b/code/BlenderTessellator.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/BlenderTessellator.h
+++ b/code/BlenderTessellator.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/CInterfaceIOWrapper.cpp
+++ b/code/CInterfaceIOWrapper.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/CInterfaceIOWrapper.h
+++ b/code/CInterfaceIOWrapper.h
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@ -1,7 +1,8 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
 #
-# Copyright (c) 2006-2017, assimp team
+# Copyright (c) 2006-2018, assimp team
 # All rights reserved.
 #
--- a/code/COBLoader.cpp
+++ b/code/COBLoader.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
 Redistribution and use of this software in source and binary forms,
--- a/code/COBLoader.h
+++ b/code/COBLoader.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/COBScene.h
+++ b/code/COBScene.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/CSMLoader.cpp
+++ b/code/CSMLoader.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/CSMLoader.h
+++ b/code/CSMLoader.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/CalcTangentsProcess.cpp
+++ b/code/CalcTangentsProcess.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/CalcTangentsProcess.h
+++ b/code/CalcTangentsProcess.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ColladaExporter.cpp
+++ b/code/ColladaExporter.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ColladaExporter.h
+++ b/code/ColladaExporter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ColladaHelper.h
+++ b/code/ColladaHelper.h
@ -4,7 +4,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ColladaLoader.cpp
+++ b/code/ColladaLoader.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ColladaLoader.h
+++ b/code/ColladaLoader.h
@ -4,7 +4,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ColladaParser.cpp
+++ b/code/ColladaParser.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ColladaParser.h
+++ b/code/ColladaParser.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
- Copyright (c) 2006-2017, assimp team
+ Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ComputeUVMappingProcess.cpp
+++ b/code/ComputeUVMappingProcess.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ComputeUVMappingProcess.h
+++ b/code/ComputeUVMappingProcess.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ConvertToLHProcess.cpp
+++ b/code/ConvertToLHProcess.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/ConvertToLHProcess.h
+++ b/code/ConvertToLHProcess.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/D3MFExporter.cpp
+++ b/code/D3MFExporter.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/D3MFExporter.h
+++ b/code/D3MFExporter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/D3MFImporter.cpp
+++ b/code/D3MFImporter.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
@ -57,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <memory>
 #include "D3MFOpcPackage.h"
-#include <contrib/unzip/unzip.h>
+#include <unzip.h>
 #include <assimp/irrXMLWrapper.h>
 #include "3MFXmlTags.h"
--- a/code/D3MFImporter.h
+++ b/code/D3MFImporter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/D3MFOpcPackage.cpp
+++ b/code/D3MFOpcPackage.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
@ -55,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 #include <algorithm>
 #include <cassert>
-#include <contrib/unzip/unzip.h>
+#include <unzip.h>
 #include "3MFXmlTags.h"
 namespace Assimp {
--- a/code/D3MFOpcPackage.h
+++ b/code/D3MFOpcPackage.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/DXFHelper.h
+++ b/code/DXFHelper.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/DXFLoader.cpp
+++ b/code/DXFLoader.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/DXFLoader.h
+++ b/code/DXFLoader.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/DeboneProcess.cpp
+++ b/code/DeboneProcess.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/DeboneProcess.h
+++ b/code/DeboneProcess.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/DefaultIOStream.cpp
+++ b/code/DefaultIOStream.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/DefaultIOSystem.cpp
+++ b/code/DefaultIOSystem.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/DefaultLogger.cpp
+++ b/code/DefaultLogger.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/DefaultProgressHandler.h
+++ b/code/DefaultProgressHandler.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/EmbedTexturesProcess.cpp
+++ b/code/EmbedTexturesProcess.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/EmbedTexturesProcess.h
+++ b/code/EmbedTexturesProcess.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/Exporter.cpp
+++ b/code/Exporter.cpp
@ -3,7 +3,8 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXAnimation.cpp
+++ b/code/FBXAnimation.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXBinaryTokenizer.cpp
+++ b/code/FBXBinaryTokenizer.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXCompileConfig.h
+++ b/code/FBXCompileConfig.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXConverter.cpp
+++ b/code/FBXConverter.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXConverter.h
+++ b/code/FBXConverter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXDeformer.cpp
+++ b/code/FBXDeformer.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXDocument.cpp
+++ b/code/FBXDocument.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXDocument.h
+++ b/code/FBXDocument.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXDocumentUtil.cpp
+++ b/code/FBXDocumentUtil.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXImportSettings.h
+++ b/code/FBXImportSettings.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXImporter.cpp
+++ b/code/FBXImporter.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXImporter.h
+++ b/code/FBXImporter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/code/FBXMaterial.cpp
+++ b/code/FBXMaterial.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
-Copyright (c) 2006-2017, assimp team
+Copyright (c) 2006-2018, assimp team
 All rights reserved.
--- a/Show More
+++ b/Show More