Commit Graph

  • e6cc187a7e Merge branch 'master' into master Dan Rosser 2022-01-11 13:51:59 +11:00
  • d68224f2ed Merge branch 'master' into patch-1 Kim Kulling 2022-01-10 23:45:03 +01:00
  • a2c2b64877 Merge pull request #4335 from assimp/update_copyrights Kim Kulling 2022-01-10 21:53:59 +01:00
  • f63b10bf45 OpenGEX: Fix usage of texture specular token Kim Kulling 2022-01-10 21:22:44 +01:00
  • 6b9732721a Merge branch 'assimp:master' into common_base64 Viktor Kovacs 2022-01-10 21:15:31 +01:00
  • 50c7301a38 Update copyrights Kim Kulling 2022-01-10 21:13:43 +01:00
  • 00bf74ad6d Merge branch 'master' into master Dan Rosser 2022-01-10 14:04:24 +11:00
  • 629c8850ec Fix imported target include directory Ben Wolsieffer 2022-01-09 19:25:02 -05:00
  • 8134cae998 Merge pull request #4333 from assimp/kimkulling-prepare_v5.1.6 v5.1.6 Kim Kulling 2022-01-09 23:45:44 +01:00
  • 30f1583dde Update utVersion.cpp Kim Kulling 2022-01-09 21:06:05 +01:00
  • 1d8667bfdc Update to 5.1.6 Kim Kulling 2022-01-09 18:06:33 +01:00
  • 9c4255b486 Assimp Android LTS NDK 23 Fix Dan Rosser 2022-01-09 18:19:33 +11:00
  • cb3e846a19 Merge pull request #4318 from vpzomtrrfrt/fix-bone-fit-check Kim Kulling 2022-01-08 12:59:21 +01:00
  • 8cb5ab69b0 Merge branch 'master' into fix-bone-fit-check Kim Kulling 2022-01-08 11:35:59 +01:00
  • b40d9abdb9 Merge pull request #4328 from assimp/kimkulling-x3d_fix_nullptr_exception Kim Kulling 2022-01-08 11:35:45 +01:00
  • 776130534b Fix nullptr-dereferencing Kim Kulling 2022-01-06 22:35:32 +01:00
  • 6a1f720f68 Merge pull request #4324 from alpire/master Kim Kulling 2022-01-06 20:43:38 +01:00
  • b14b34d2b8 LWSLoader: Fix out of bounds iterator access Alex Rebert 2022-01-05 15:19:06 -05:00
  • 310c81aaa2 Add support for spanned archives Alex Rebert 2022-01-05 15:10:11 -05:00
  • 34d8fba100 Fix stack overflow in ZipArchiveIOSystem::MapArchive Alex Rebert 2022-01-05 10:01:46 -05:00
  • 089fc7311a GCC might have an issue with value type Errors tanolino 2022-01-05 10:34:27 +01:00
  • 04d2d13172 Locale independent meter scale tanolino 2022-01-05 10:10:38 +01:00
  • 1d815fc23e Merge pull request #4321 from assimp/kimkulling_update_morphing_method_doc_issue4320 Kim Kulling 2022-01-04 17:46:37 +01:00
  • a591944c04 Add link to used enum for a better understandability for the mesh morphing method. Kim Kulling 2022-01-04 17:32:18 +01:00
  • 87e9dbac40 Fix bone fitted check in gltf2 exporter Colin Reeder 2022-01-03 16:32:34 -07:00
  • 125acf9ec8 Merge remote-tracking branch 'origin/master' into common_base64 kovacsv 2022-01-02 19:47:57 +01:00
  • bbe12240ca Move Base64 encode/decode functionality to the common folder. kovacsv 2022-01-02 19:47:43 +01:00
  • c2375a4ff0 Merge pull request #4272 from errissa/pbr-obj v5.1.5 Kim Kulling 2021-12-31 10:38:50 +01:00
  • ab19cff328 Merge branch 'master' into pbr-obj Kim Kulling 2021-12-31 08:33:30 +01:00
  • 049a241855 Merge pull request #4314 from pseiderer/ps-devel-fix-namespace-001 Kim Kulling 2021-12-31 08:32:54 +01:00
  • a86ab45161 Merge branch 'master' into ps-devel-fix-namespace-001 Kim Kulling 2021-12-31 08:20:24 +01:00
  • a099fe7cd3 BlenderScene: use explicit namespace instead of using namespace Peter Seiderer 2021-12-30 18:01:54 +01:00
  • 85dd84cc78 Merge pull request #4259 from VyacheslavVanin/fix-fbx-metalness-import Kim Kulling 2021-12-29 20:35:46 +01:00
  • 0a5bd792de Merge branch 'master' into fix-fbx-metalness-import Kim Kulling 2021-12-29 19:08:16 +01:00
  • c882731688 Merge pull request #4311 from SirLynix/fix-mingw Kim Kulling 2021-12-29 17:31:12 +01:00
  • 81fc50f612 CMake: Replace CMAKE_COMPILER_IS_MINGW by MINGW Jérôme Leclercq 2021-12-28 14:59:37 +01:00
  • 2da06dd41a Merge branch 'master' into fix-fbx-metalness-import Vyacheslav Vanin 2021-12-26 17:31:33 +03:00
  • 54a8da1d55 Merge pull request #4293 from assimp/add_colsole_progresshandler_issue_963 Kim Kulling 2021-12-26 11:38:24 +01:00
  • d44641398f Add console progresshandler Kim Kulling 2021-12-26 11:16:02 +01:00
  • d11d2fc60d fix Inter-Quake Model (IQM) Importer MSVC warnings Garux 2021-12-24 18:27:52 +03:00
  • 4d7e817bd8 Merge pull request #4284 from assimp/kimkulling-skip_empty_embedded_textures_issue4238 Kim Kulling 2021-12-23 13:03:43 +01:00
  • db2500c393 MDL: Do not try to copy empty embedded texture Kim Kulling 2021-12-23 12:28:43 +01:00
  • 64af16c427 Merge pull request #4283 from assimp/kimkulling-avoid_invalid_string_access_issue4222 Kim Kulling 2021-12-22 21:28:42 +01:00
  • 635153b3a4 LWS-Import: Avoid access to empty string token Kim Kulling 2021-12-22 21:08:28 +01:00
  • 7ec52e9e02 Merge pull request #4282 from assimp/kimkulling-fix_heap_overflow_during_utf8_issue4230 Kim Kulling 2021-12-22 20:56:39 +01:00
  • 2c66d4d3a2 Optimize the check Kim Kulling 2021-12-22 20:43:44 +01:00
  • 215f4e1f4d Fix typo Kim Kulling 2021-12-22 20:02:29 +01:00
  • 2eb86d75b8 Make sure no overflow can happen Kim Kulling 2021-12-22 19:45:19 +01:00
  • 19371af6e6 Support PBR properties/maps in Obj importer Rene Sepulveda 2021-12-20 13:43:46 -05:00
  • cab7b330ee Merge branch 'master' into so-unloading Kim Kulling 2021-12-20 17:58:18 +01:00
  • 80b0b897ed Merge pull request #4266 from assimp/kimkulling-patch-1 v5.1.4 Kim Kulling 2021-12-18 21:42:19 +01:00
  • 572e31ddcb Update version to 5.1.4 Kim Kulling 2021-12-18 21:30:04 +01:00
  • 9dfd401624 Merge pull request #4263 from RivIs-sssa01/fix_X3DImporter.cpp_closingBraces Kim Kulling 2021-12-18 21:28:32 +01:00
  • 5a46597e47 Merge branch 'master' into fix_X3DImporter.cpp_closingBraces Kim Kulling 2021-12-18 21:17:23 +01:00
  • 01f68dd916 Merge pull request #4264 from Garux/IMAGE1.bmp_jpg Kim Kulling 2021-12-18 21:16:59 +01:00
  • 46f618a6ef add Inter-Quake Model (IQM) Importer Garux 2021-12-18 15:34:58 +03:00
  • 7fc4603579 fix test/models/3DS/IMAGE1.bmp: is jpg Garux 2021-12-18 14:32:46 +03:00
  • d7bf8d6e07 Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define. sssaoi 2021-12-18 14:50:22 +09:00
  • 53968550e4 Merge branch 'master' into fix-fbx-metalness-import Vyacheslav Vanin 2021-12-17 12:08:55 +03:00
  • 6693e7e08c Merge pull request #4256 from rumgot/cmake_no_known_features_error_fix Kim Kulling 2021-12-16 21:35:52 +01:00
  • 3e97329fa1 Merge branch 'master' into cmake_no_known_features_error_fix Kim Kulling 2021-12-16 20:27:58 +01:00
  • c72e3905c2 Merge pull request #4261 from assimp/kimkulling-enable_language_support_issue4257-2 Kim Kulling 2021-12-16 20:27:17 +01:00
  • 2ffa0c59eb Switch to C++11 until gtest gets an update. Kim Kulling 2021-12-16 19:54:40 +01:00
  • af42d53c92 Enable C++17 and C99 Kim Kulling 2021-12-16 19:41:15 +01:00
  • 1a4d4fb545 Enable C++17 and C99 kimkulling-enable_language_support_issue4257-1 Kim Kulling 2021-12-16 19:41:09 +01:00
  • c4e3fe4967 Enable C++17 and C99 kimkulling-enable_language_support_issue4257 Kim Kulling 2021-12-16 19:41:06 +01:00
  • c4d858cf4d Merge pull request #4260 from assimp/kimkulling-patch-1 Kim Kulling 2021-12-16 15:39:01 +01:00
  • 7a29147095 Fix a typo Kim Kulling 2021-12-16 14:55:23 +01:00
  • efdaf603b0 Merge branch 'master' into so-unloading Kim Kulling 2021-12-16 14:52:58 +01:00
  • 46b28a442b Merge pull request #4226 from umlaeute/bugfix/import-crashes Kim Kulling 2021-12-16 14:51:34 +01:00
  • 1afe7e6255 fix fbx import metalness Vyacheslav.Vanin 2021-12-16 12:09:06 +03:00
  • 26dc168449 Merge branch 'master' into bugfix/import-crashes Kim Kulling 2021-12-15 07:54:48 +01:00
  • 92aef9236f Fixed cmake error: No known features for C compiler when using the assimp library from another project. rumgot 2021-12-14 23:54:36 +03:00
  • 8322e393c5 Merge pull request #4244 from kovacsv/copyscene_fix Kim Kulling 2021-12-14 00:14:42 +01:00
  • 003942aafe Merge branch 'master' into copyscene_fix Kim Kulling 2021-12-13 21:19:08 +01:00
  • 0491eb3591 Merge pull request #4253 from assimp/kimkulling_fix_double_prec_build_issue4248 Kim Kulling 2021-12-13 21:17:15 +01:00
  • d619f7015a Merge branch 'master' into copyscene_fix Viktor Kovacs 2021-12-13 20:08:45 +01:00
  • 65bc801734 Some fixes for possible divisions by zero Kim Kulling 2021-12-13 18:48:58 +01:00
  • e4f38810ca Add missing static casts Kim Kulling 2021-12-13 18:12:19 +01:00
  • cb657e4c13 Use correct XmlParser-methods and add some missing casts Kim Kulling 2021-12-13 18:06:23 +01:00
  • 052594568a Merge pull request #4247 from inhosens/master Kim Kulling 2021-12-12 21:42:14 +01:00
  • 54e60b031e Merge branch 'master' into master Kim Kulling 2021-12-12 21:12:37 +01:00
  • 4959924dab Merge branch 'master' into copyscene_fix Viktor Kovacs 2021-12-10 20:10:25 +01:00
  • 819d9f7257 Merge pull request #4250 from assimp/kimkulling-fix_division_by_zero_issue4235-1 Kim Kulling 2021-12-10 15:03:01 +01:00
  • 33c6762272 Update HMPLoader.cpp Kim Kulling 2021-12-10 14:32:45 +01:00
  • fa65d538dd Update HMPLoader.cpp kimkulling-fix_division_by_zero_issue4235 Kim Kulling 2021-12-10 14:32:44 +01:00
  • 6bb856335f Merge pull request #4249 from assimp/kimkulling-fix_nullptr_dereferencing_issue4237 Kim Kulling 2021-12-10 11:02:32 +01:00
  • 68682d75b5 Fix nullptr dereferencing from std::shared_ptr Kim Kulling 2021-12-10 08:39:21 +01:00
  • c2297e9199 Revert "FBXConverter : Fix timescales of FBX animations" Inho Lee 2021-12-08 13:45:35 +01:00
  • d2c8cb755e Merge branch 'master' into copyscene_fix Viktor Kovacs 2021-12-08 14:29:31 +01:00
  • ea2e442046 Merge pull request #4245 from assimp/kimkulling-fix-division-by-zero-issue4240 Kim Kulling 2021-12-07 21:37:50 +01:00
  • e51feac2c5 Update PolyTools.h Kim Kulling 2021-12-07 21:19:01 +01:00
  • 1e4861f86e Fix division by zero in PointInTriangle2D Kim Kulling 2021-12-07 20:45:21 +01:00
  • 2be6bac4b0 Bug: Export crashes when any of the meshes contains texture coordinate names #4243 kovacsv 2021-12-07 20:42:43 +01:00
  • 9a7ee0ac14 Throw a DeadlyImportError rather than an assertion if all materials are redundant and thus removed IOhannes m zmölnig 2021-12-07 12:35:15 +01:00
  • 6e090c88b8 fix index variable for surfaces IOhannes m zmölnig 2021-12-07 12:13:31 +01:00
  • 75e7d0f6ef Merge branch 'master' into deprecated_gltfpbr_macros RichardTea 2021-12-07 09:01:50 +00:00
  • 70f5cca9c3 Merge pull request #4219 from assimp/kimkulling-v5.1.3 v5.1.3 Kim Kulling 2021-12-04 21:01:52 +01:00
  • 5b4829155c Merge branch 'master' into so-unloading Kim Kulling 2021-12-04 20:28:12 +01:00
  • 983b20cda6 Update CMakeLists.txt Kim Kulling 2021-12-04 20:26:29 +01:00