Merge branch 'assimp:master' into sfjohnston_mods

2023-07-23 08:37:47 -07:00
parent 64e0ba2625 131bc61d47
commit 3ec8a36764
32 changed files with 3 additions and 400 deletions
--- a/code/AssetLib/glTF2/glTF2Asset.inl
+++ b/code/AssetLib/glTF2/glTF2Asset.inl
@@ -45,6 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/StringUtils.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/Base64.hpp>
+#include <rapidjson/document.h>
+#include <rapidjson/schema.h>
+#include <rapidjson/stringbuffer.h>

 // clang-format off
 #ifdef ASSIMP_ENABLE_DRACO