Merge branch 'master' into kimkulling_dev

2020-02-16 13:10:41 +01:00
parent b3d894ee73 a0000e5be4
commit ada4f51d5b
791 changed files with 3896 additions and 3616 deletions
--- a/code/FBX/FBXConverter.cpp
+++ b/code/FBX/FBXConverter.cpp
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2019, assimp team
+Copyright (c) 2006-2020, assimp team


 All rights reserved.
@@ -1565,9 +1565,8 @@ namespace Assimp {
                bone_map.clear();
            }
            catch (std::exception &e) {
-				FBXImporter::LogError(e.what());
+				        FBXImporter::LogError(e.what());
                std::for_each(bones.begin(), bones.end(), Util::delete_fun<aiBone>());
-
                throw;
            }