Max Vollmer (Microsoft Havok) fb11705dd0 Merge branch 'master' into gltf1_gltf2_split

2020-07-06 09:11:06 +01:00

..

AssetLib

* Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently.

2020-07-05 19:22:31 +01:00

CApi

replace NULL and avoid ai_assert with more than 2 tests.

2020-06-23 21:05:42 +02:00

Common

* Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently.

2020-07-05 19:22:31 +01:00

Material

replace NULL and avoid ai_assert with more than 2 tests.

2020-06-23 21:05:42 +02:00

PostProcessing

Ensure asserts are defined where expected.

2020-07-02 14:53:29 +01:00

res

Updated copyright dates.

2020-01-20 08:53:12 -05:00

.editorconfig

…

CMakeLists.txt

Allow assert handling to be replaced.

2020-06-23 11:55:51 +01:00