Merge pull request godotengine#42941 from RevoluPowered/fbx-3-2-2020

[3.2] FBX importer rewrite
V-Sekai · Oct 30, 2020 · 4f908fb · 4f908fb
2 parents 61ad669 + 8197a61
commit 4f908fb
Show file tree

Hide file tree

Showing 284 changed files with 13,849 additions and 72,022 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -55,6 +55,13 @@ Comment: Godot Engine logo
 Copyright: 2017, Andrea Calabró
 License: CC-BY-3.0
 
+Files: ./modules/fbx/fbx_parser/
+Comment: Open Asset Import Library (assimp)
+Copyright: 2006-2016, assimp team
+ 2007-2020, Juan Linietsky, Ariel Manzur.
+ 2014-2020, Godot Engine contributors.
+License: BSD-3-clause and Expat
+
 Files: ./platform/android/java/aidl/com/android/vending/billing/IInAppBillingService.aidl
  ./platform/android/java/res/layout/status_bar_ongoing_event_progress_bar.xml
  ./platform/android/java/src/com/google/android/vending/expansion/downloader/*
@@ -110,11 +117,6 @@ Copyright: 2007, Starbreeze Studios
  2014-2020, Godot Engine contributors.
 License: Expat and Zlib
 
-Files: ./thirdparty/assimp/
-Comment: Open Asset Import Library (assimp)
-Copyright: 2006-2016, assimp team
-License: BSD-3-clause
-
 Files: ./thirdparty/bullet/
 Comment: Bullet Continuous Collision Detection and Physics Library
 Copyright: 2003-2013, Erwin Coumans

diff --git a/modules/assimp/SCsub b/modules/assimp/SCsub