Commit Graph

  • 0a1535647a
    Merge branch 'master' into patch-1 Kim Kulling 2021-01-02 00:01:25 +0100
  • 07aace0fdd
    Merge branch 'master' into dev/gltf-KHR_materials Danny-Kint 2020-12-31 07:08:31 +0100
  • 465220b26a
    Merge branch 'master' into 3mf-improvements Kim Kulling 2020-12-30 18:12:26 +0100
  • 88e5f3416e
    Merge pull request #3562 from makitsune/fix-gltf-bin-from-memory Kim Kulling 2020-12-30 11:50:35 +0100
  • e0803b3ec2
    Merge branch 'master' into fix-gltf-bin-from-memory Kim Kulling 2020-12-30 11:17:31 +0100
  • b8d947299a
    Merge branch 'master' into dev/gltf-KHR_materials Danny-Kint 2020-12-29 17:09:15 +0100
  • 37df38f951 [3MF] Improves node naming Jean-Louis 2020-12-29 15:46:28 +0100
  • 3ccfc03c48
    Merge pull request #3542 from ms-maxvollmer/fbx_tokenizer_fix Kim Kulling 2020-12-28 20:19:35 +0100
  • 4025c57fd0 [3MF] Parse the transform of the components Jean-Louis 2020-12-28 15:47:20 +0100
  • eda967bd02 Parse the <build> node + refactoring Jean-Louis 2020-12-28 12:31:54 +0100
  • 3e320100e5
    Merge branch 'master' into dev/gltf-KHR_materials Danny-Kint 2020-12-28 10:29:17 +0100
  • 07b59f539d
    Merge branch 'master' into dev/gltf-KHR_materials Danny-Kint 2020-12-28 08:48:54 +0100
  • ca653e0c6a Fix glTF from memory loading .bin with a custom IOHandler Maki 2020-12-28 07:18:50 +0000
  • 629147043e XmlParser: Fixed an error message when the file was correctly parsed Jean-Louis 2020-12-27 18:13:49 +0100
  • bfe35fc06b contrib/zlib/CMakeLists.txt: don't install zlib Fabrice Fontaine 2020-12-27 15:27:41 +0100
  • eed75aaf2c Remove debug print Jean-Louis 2020-12-26 14:57:52 +0100
  • 0ec8d6e285 [3MF] Missing file in previous commit + parse object material in the importer Jean-Louis 2020-12-26 14:04:45 +0100
  • 0952038461 Small refactoring on 3MF export Jean-Louis 2020-12-26 03:02:18 +0100
  • c10d592b79 Fix material parsing in the 3MF importer Jean-Louis 2020-12-26 02:36:24 +0100
  • 77f9c2854a
    Merge branch 'master' into fbx_tokenizer_fix Kim Kulling 2020-12-25 21:44:26 +0100
  • 404bedd8be
    Merge pull request #3541 from ms-maxvollmer/gltf2_fixes Kim Kulling 2020-12-25 19:22:53 +0100
  • 7bb4b3fb03
    Merge branch 'master' into dev/gltf-KHR_materials Danny-Kint 2020-12-25 16:19:07 +0100
  • 3f5238d7c1
    Merge branch 'master' into gltf2_fixes Kim Kulling 2020-12-24 16:48:36 +0100
  • 2013932e7a
    Merge pull request #3555 from someonewithpc/master Kim Kulling 2020-12-24 16:48:08 +0100
  • effe52368c No need to allocate a full size buffer for small files Jean-Louis 2020-12-24 12:18:07 +0100
  • 895137c7d7 Fix unzip max buffer length error Jean-Louis 2020-12-24 11:39:59 +0100
  • 3a78db66a5 fix some doc-strings. fix_docs Kim Kulling 2020-12-24 09:10:20 +0100
  • c464d01778 Fix fopen64, ftello64, fseeko64 declarations on all platforms Jean-Louis 2020-12-24 03:18:09 +0100
  • 54be7ac582 Update unzip contrib Jean-Louis 2020-12-24 01:53:40 +0100
  • 2873d862b0
    Update CMakeLists.txt Hugo Sales 2020-12-23 15:44:37 +0000
  • 3fd9a991fe Fix VS compilation Jean-Louis 2020-12-23 13:43:47 +0100
  • 6c6185dad0 Small zip refacto in 3MF exporter Jean-Louis 2020-12-23 12:57:14 +0100
  • 7574cd08fb Update CMakeList Jean-Louis 2020-12-23 12:41:44 +0100
  • 63759d2501 Update of minizip to 1.2 Jean-Louis 2020-12-23 12:41:07 +0100
  • dbffe25c9d
    Merge branch 'master' into dev/gltf-KHR_materials Danny-Kint 2020-12-23 11:33:04 +0100
  • 383c97e380 Add KHR_materials_transmission during export Danny Kabrane 2020-12-23 10:43:21 +0100
  • 2b097c1e73 Add KHR_materials_transmission during import Danny Kabrane 2020-12-23 10:43:01 +0100
  • 197bf1e617 Add KHR_materials_clearcoat during export Danny Kabrane 2020-12-23 09:56:15 +0100
  • f8c63d874b support KHR_materials_clearcoat during import Danny Kabrane 2020-12-23 08:12:09 +0100
  • 102d380711
    Merge pull request #3540 from wasd845/master Kim Kulling 2020-12-22 12:07:01 +0100
  • b4b011e764
    Merge branch 'master' into master Kim Kulling 2020-12-22 11:11:45 +0100
  • ed2b680f46
    Merge pull request #3533 from Biswa96/fix-casting-mingw Kim Kulling 2020-12-21 20:04:27 +0100
  • 50f9fb28b6
    Merge branch 'master' into fix-casting-mingw Kim Kulling 2020-12-21 18:29:18 +0100
  • c095ba1399
    Merge branch 'master' into dev/gltf-sheen Danny-Kint 2020-12-21 14:53:00 +0100
  • aa9d6ce7b7 add support for khr_materials_sheen during export Danny Kabrane 2020-12-21 14:34:16 +0100
  • 0fdda99ea1 add underscore (MATERIAL_SHEEN instead of MATERIALSHEEN) Danny Kabrane 2020-12-21 14:33:35 +0100
  • 947d72d281
    Merge branch 'master' into patch-1 Martin 2020-12-21 09:53:22 +0100
  • 5f5f1cf7a0
    Merge pull request #3531 from JLouis-B/gltf2-exporter-crash Kim Kulling 2020-12-20 21:57:44 +0100
  • 63b0a97369 import KHR_materials_sheen Danny Kabrane 2020-12-20 07:59:12 +0100
  • 981923821a
    Merge branch 'master' into gltf2-exporter-crash Kim Kulling 2020-12-18 16:27:06 +0100
  • 6003be382c
    Merge branch 'master' into patch-1 Martin 2020-12-17 14:29:51 +0100
  • b75ea77365 Merge branch 'develop3' of https://github.com/wasd845/assimp into develop3 cywang 2020-12-17 17:09:20 +0800
  • 15cff94926 add operator* in aiQuaterniont cywang 2020-12-17 17:08:06 +0800
  • 2250462853
    Merge branch 'master' into develop3 wasd845 2020-12-17 16:18:35 +0800
  • b6f8448b78 add operator* in aiQuaterniont cywang 2020-12-17 16:13:35 +0800
  • f6dd11ca1a add operator* in aiQuaterniont cywang 2020-12-17 15:07:03 +0800
  • b3e1ee3ca0
    Merge pull request #3524 from inhosens/master Kim Kulling 2020-12-16 22:33:16 +0100
  • 4e5b25cd81 Keep AnimMesh data during the SortByPTypeProcess Inho Lee 2020-12-16 17:55:05 +0100
  • b8bf1eac04 FBXConverter : Fix timescales of FBX animations Inho Lee 2020-12-07 09:51:19 +0100
  • 8003a016c2
    Add some spaces to format code consistently Martin 2020-12-15 12:36:00 +0100
  • 3718980c09
    Only consider continuation tokens at end of line Martin 2020-12-15 12:16:22 +0100
  • 88fa7a0611 fix fixes of docs + update doxygen config. Kim Kulling 2020-12-14 19:33:37 +0100
  • a15adc9fbc Fixed copypaste error Max Vollmer 2020-12-14 17:01:42 +0000
  • 9d3c0081eb Throw if property length is out of bounds Max Vollmer 2020-12-14 16:49:04 +0000
  • 1db51503d8 Throw instead of assert on invalid file input Max Vollmer 2020-12-14 16:44:56 +0000
  • 5436e16802 * Fix memory leak in GLTF2 Importer that occurs when an exception gets thrown while constructing a scene * Fix crash in GLTF2 Importer when a scene with dangling/uninitialized pointers gets deleted after an exception was thrown * Fix crash in GLTF2 Importer when channel sampler is not set (negative index) Max Vollmer 2020-12-14 16:37:02 +0000
  • 0e939cc450
    Merge pull request #1 from assimp/master Max Vollmer (Microsoft Havok) 2020-12-14 16:12:45 +0000
  • 2f1ff974fd
    Merge pull request #3519 from MalcolmTyrrell/3dsMax2021PbrMaterials Kim Kulling 2020-12-14 17:11:47 +0100
  • 4e9176d2cd
    _dest may be destructed twice if _dest is not null in MergeScenes() wasd845 2020-12-14 19:16:29 +0800
  • 922f874e78 Merge branch 'gltf2-exporter-crash' of https://github.com/JLouis-B/assimp into gltf2-exporter-crash Jean-Louis Boudrand 2020-12-13 17:03:09 +0100
  • d18fce3f06 Fix https://github.com/assimp/assimp/issues/3054 Jean-Louis Boudrand 2020-12-13 17:02:50 +0100
  • 33e7e2366c
    Merge branch 'master' into gltf2-exporter-crash Jean-Louis Boudrand 2020-12-13 16:48:40 +0100
  • c65f2cb3fb Remove extra semicolon while GCC being pedantic. Biswapriyo Nath 2020-12-12 11:15:04 +0530
  • ceb87cd0fa
    Create android_master.yml kimkulling-patch-android Kim Kulling 2020-12-12 14:34:07 +0100
  • e2af015a57 Common: Fix GCC error invalid conversion in MINGW. Biswapriyo Nath 2020-12-11 21:43:09 +0530
  • 7dd0596010
    Merge branch 'master' into 3dsMax2021PbrMaterials Kim Kulling 2020-12-11 14:31:00 +0100
  • 3d49d06bcc
    Merge pull request #3518 from Biswa96/add-msvc-check Kim Kulling 2020-12-11 14:30:25 +0100
  • a2adef8726
    Merge branch 'master' into add-msvc-check Kim Kulling 2020-12-11 14:11:10 +0100
  • 80bb8ab726
    Merge pull request #3521 from huiji12321/master Kim Kulling 2020-12-11 14:07:49 +0100
  • 8701a86c9d Fixed a crash of the Gltf 2 exporter in the case of an animation without a translation, rotation or scale animation key. Jean-Louis Boudrand 2020-12-10 23:47:54 +0100
  • db475e7d4a
    Merge branch 'master' into master huiji12321 2020-12-10 09:04:24 +0800
  • 10092cd1ec
    Merge pull request #3515 from LoicFr/master Kim Kulling 2020-12-09 21:14:51 +0100
  • e4a1fb171e
    Merge branch 'master' into master Kim Kulling 2020-12-09 17:58:18 +0100
  • c168c4689e
    Merge branch 'master' into master Kim Kulling 2020-12-09 13:59:27 +0100
  • 99e4a10dc3
    Merge pull request #3528 from tellypresence/issue-3525_use_option_for_rapidjson_no_member_iterator Kim Kulling 2020-12-09 13:58:52 +0100
  • 6db5b7046f Provide option for rapidjson no-member-iterator define tellypresence 2020-12-09 20:21:43 +0900
  • 9aa5cfbd7e
    Merge branch 'master' into issue-3525_rapidjson_define_breaks_android_build Steve M 2020-12-09 08:18:10 +0900
  • 816bbc852c
    Merge branch 'master' into master Kim Kulling 2020-12-08 19:54:04 +0100
  • aee01e8345
    Merge pull request #3514 from ms-maxvollmer/gltf_fixes Kim Kulling 2020-12-08 19:48:53 +0100
  • 45b80e5c83 Disable rapidjson #define for android tellypresence 2020-12-08 22:14:51 +0900
  • aee67b0683 Disable rapidjson #define for android tellypresence 2020-12-08 21:55:02 +0900
  • 41a243e316
    Merge pull request #1 from assimp/master Steve M 2020-12-08 21:42:26 +0900
  • 233d834514
    Merge branch 'master' into gltf_fixes Kim Kulling 2020-12-07 20:36:53 +0100
  • 41904ad7ce
    Merge pull request #3516 from assimp/kimkulling-patch-8 Kim Kulling 2020-12-07 20:30:21 +0100
  • 1f8c75c871
    Merge branch 'master' into kimkulling-patch-8 Kim Kulling 2020-12-07 16:55:07 +0100
  • c0d7ea981a
    Merge branch 'master' into gltf_fixes Kim Kulling 2020-12-04 16:02:16 +0100
  • 63f1b66224
    Merge pull request #3512 from boguscoder/master Kim Kulling 2020-12-04 15:58:22 +0100
  • eccdc6dc96
    Merge branch 'master' into master Kim Kulling 2020-12-04 15:30:56 +0100
  • f87ab4b4d7
    Merge pull request #3506 from MalcolmTyrrell/fbxExceptionSafety Kim Kulling 2020-12-04 15:30:27 +0100
  • 5020a0aa33
    Merge branch 'master' into fbxExceptionSafety Kim Kulling 2020-12-04 11:01:56 +0100