Commit Graph

  • f90bb2ca26 Merge pull request #3363 from malortie/fix-cmake-override-output-path3 Kim Kulling 2020-08-08 10:54:31 +02:00
  • b3f85613fc Merge branch 'master' into fix-cmake-override-output-path3 Kim Kulling 2020-08-08 10:42:36 +02:00
  • 65265594ba Merge pull request #3362 from assimp/issue_3004 Kim Kulling 2020-08-08 09:19:53 +02:00
  • fbd9c9651d fix clang detection Kim Kulling 2020-08-08 09:06:41 +02:00
  • 11daed69d3 Fixed overwriting of CMake global output directory variables. Marc-Antoine Lortie 2020-08-07 16:04:39 -04:00
  • 30d83d40c1 fix brackets for template in template Kim Kulling 2020-08-07 19:15:28 +02:00
  • 29b72fe6d4 fix cmake warning kimkulling 2020-08-07 16:22:34 +02:00
  • aaea564cbe closes https://github.com/assimp/assimp/issues/3004 : use prefix when ms_tools were found. kimkulling 2020-08-07 16:14:44 +02:00
  • 4c8b9fb96d Merge pull request #3360 from assimp/issue_2992 Kim Kulling 2020-08-07 14:41:30 +02:00
  • 13d7fad7f7 closes https://github.com/assimp/assimp/issues/2992: add single or double precision + missing compilers. kimkulling 2020-08-07 14:23:07 +02:00
  • 8504c191db Merge pull request #3356 from qarmin/more_ubsan_flags Kim Kulling 2020-08-05 20:24:13 +02:00
  • 919f730844 Merge branch 'master' into more_ubsan_flags Kim Kulling 2020-08-05 19:59:18 +02:00
  • 89eb7f889a Merge pull request #3355 from assimp/issue_3353 Kim Kulling 2020-08-05 19:56:46 +02:00
  • 58bf23be55 Merge branch 'master' into issue_3353 Kim Kulling 2020-08-05 18:03:26 +02:00
  • b94183376c Fix possible overflow in new. Kim Kulling 2020-08-05 17:56:44 +02:00
  • c238508706 Merge pull request #3357 from assimp/issue_3291 Kim Kulling 2020-08-04 21:04:58 +02:00
  • 1f348c5fc0 Remove redundant float f Kim Kulling 2020-08-04 20:55:29 +02:00
  • aabf12827b fix typo Kim Kulling 2020-08-04 17:52:43 +02:00
  • 855b47452e Export opacity is 3DS Kim Kulling 2020-08-04 17:41:28 +02:00
  • c60373c0ba Merge branch 'master' into more_ubsan_flags Rafał Mikrut 2020-08-03 23:17:53 +02:00
  • 447805f01a Added more undefined sanitizer flags Rafał Mikrut 2020-08-03 23:12:08 +02:00
  • aa6c35f683 Merge pull request #3350 from MalcolmTyrrell/fbxVersionCheck Kim Kulling 2020-08-03 21:30:03 +02:00
  • e7ae576614 undo change Kim Kulling 2020-08-03 15:54:19 +02:00
  • 435bba30dd Move functions into the correct preprocessor branch Kim Kulling 2020-08-03 09:30:02 +02:00
  • 008e551f8e Merge branch 'master' into fbxVersionCheck Kim Kulling 2020-07-31 14:33:21 +02:00
  • ac8a8a5ad4 Merge pull request #3349 from rmstyrczula/fixFbxExportNullptr Kim Kulling 2020-07-31 14:32:32 +02:00
  • 0282f358a4 Remove unneeded check. Malcolm Tyrrell 2020-07-31 12:40:17 +01:00
  • 301bae3967 Improve message Malcolm Tyrrell 2020-07-30 16:37:41 +01:00
  • eaf0587dd8 FBX Version/Size Check Malcolm Tyrrell 2020-07-30 14:56:01 +01:00
  • 3170c3d15c FBXExport: Fix crash if scene->mMetaData is null Ryan Styrczula 2020-07-30 09:21:22 -04:00
  • 58b81a2590 start migrating X3D. Kim Kulling 2020-07-26 10:17:21 +02:00
  • 575ce6136d Merge pull request #3347 from rbsheth/rbsheth_fix_warn Kim Kulling 2020-07-25 19:06:21 +02:00
  • ad18e365e5 Fixing more warnings Rahul Sheth 2020-07-22 10:57:25 -04:00
  • 6828cf2f03 Merge pull request #3328 from awr1/fix-mingw-priumax Kim Kulling 2020-07-24 11:34:25 +02:00
  • c7a9ef30cc Merge branch 'master' into fix-mingw-priumax Kim Kulling 2020-07-24 11:14:15 +02:00
  • e8cbc0928e Merge pull request #3346 from assimp/fix_compiler_warnings Kim Kulling 2020-07-24 11:11:39 +02:00
  • 6886ea6c65 Fix warning: comparison between unsigned and signed. Kim Kulling 2020-07-24 10:57:24 +02:00
  • 59e15b7fd1 Merge pull request #3345 from assimp/fix_include Kim Kulling 2020-07-23 21:37:00 +02:00
  • c62fa76cda Merge branch 'master' into fix_include Kim Kulling 2020-07-23 21:09:11 +02:00
  • dcc8419722 add missing include for logging. Kim Kulling 2020-07-23 21:01:08 +02:00
  • 07c1396b50 Merge pull request #3344 from assimp/fix_include Kim Kulling 2020-07-23 20:26:56 +02:00
  • 9a4b3fd9de use correct include. Kim Kulling 2020-07-23 20:16:11 +02:00
  • 8edb0d5278 Merge pull request #3343 from assimp/fix_assimp_fuzzing Kim Kulling 2020-07-23 20:08:17 +02:00
  • eb44eb13e6 fix namespace issue in fuzzer. Kim Kulling 2020-07-23 19:15:46 +02:00
  • c67a5bd903 Merge pull request #3342 from assimp/kimkulling-patch-7 Kim Kulling 2020-07-23 12:00:10 +02:00
  • b2df27a6f0 Merge branch 'master' into kimkulling-patch-7 Kim Kulling 2020-07-23 11:46:33 +02:00
  • c71dbcc37e Merge pull request #3329 from MalcolmTyrrell/gltfIndexOutOfRangeFix Kim Kulling 2020-07-23 11:43:39 +02:00
  • 5e0b9e0f32 Remove travix + assveyor. Kim Kulling 2020-07-23 11:35:36 +02:00
  • 0f442b1ff2 Merge branch 'master' into gltfIndexOutOfRangeFix Kim Kulling 2020-07-23 11:27:34 +02:00
  • 52c29612f7 Merge pull request #3333 from RichardTea/acloader_enums Kim Kulling 2020-07-23 11:27:07 +02:00
  • a33557be71 Merge branch 'master' into acloader_enums Kim Kulling 2020-07-22 23:50:51 +02:00
  • ac83e3593e Merge pull request #3335 from RichardTea/issue-3334_cl_D9025 Kim Kulling 2020-07-22 23:50:12 +02:00
  • 162c8be184 Merge branch 'master' into issue-3334_cl_D9025 Kim Kulling 2020-07-22 22:57:14 +02:00
  • a2186a0553 Merge pull request #3336 from RichardTea/issue-3332_msvc2017 Kim Kulling 2020-07-21 00:40:05 +02:00
  • 76a6bb36f6 Merge branch 'master' into issue-3332_msvc2017 Kim Kulling 2020-07-20 22:04:35 +02:00
  • 6a9ca736c1 Merge pull request #3337 from MeyerFabian/build/clang-cl-windows Kim Kulling 2020-07-20 21:04:55 +02:00
  • 51e592123a Fix two deletions. MeyerFabian 2020-07-20 18:42:57 +02:00
  • a19e4e4112 Make clang with msvc abi work. MeyerFabian 2020-07-20 18:28:50 +02:00
  • 13ee2306c3 build/clang-cl-windows MeyerFabian 2020-07-20 17:04:11 +02:00
  • 9cad10a995 Disable MSVC warnings on all MSVC RichardTea 2020-07-17 14:58:51 +01:00
  • a4eceb7b3f Set CMP0092 the other way RichardTea 2020-07-17 12:06:52 +01:00
  • c527a33aa8 Merge remote-tracking branch 'upstream/master' RichardTea 2020-07-17 12:00:38 +01:00
  • ef37fc4632 Merge branch 'master' into issue-3334_cl_D9025 RichardTea 2020-07-17 11:59:53 +01:00
  • ce133e5add Set CMake policy CMP0092 RichardTea 2020-07-17 11:58:17 +01:00
  • f2e3e43fbc Merge branch 'master' into acloader_enums RichardTea 2020-07-17 11:30:50 +01:00
  • 17b9403b7a ACLoader: Use enum for Surface flags RichardTea 2020-07-17 11:23:50 +01:00
  • b2e53783de Merge branch 'master' into fix-mingw-priumax Kim Kulling 2020-07-17 12:07:46 +02:00
  • 37056f0242 Merge pull request #3327 from rbsheth/rbsheth_update_hunter Kim Kulling 2020-07-17 12:02:28 +02:00
  • fa486240d5 Merge branch 'master' into rbsheth_update_hunter Kim Kulling 2020-07-17 11:39:55 +02:00
  • 1975579268 Merge pull request #3326 from rmstyrczula/master Kim Kulling 2020-07-17 11:33:02 +02:00
  • 719cc82a1f Apply clangformat RichardTea 2020-07-17 10:29:44 +01:00
  • 8c60879485 Rollup to 'upstream/master' RichardTea 2020-07-17 10:03:31 +01:00
  • 516bdc2a4b Merge branch 'master' into master Kim Kulling 2020-07-16 22:48:02 +02:00
  • c55ca47666 Merge pull request #3322 from AndrewJDR/master Kim Kulling 2020-07-16 22:47:17 +02:00
  • 147c5f7cd2 Merge branch 'master' into master Kim Kulling 2020-07-16 21:37:46 +02:00
  • 0a165ee666 Merge pull request #3311 from ms-maxvollmer/gltf1_gltf2_split Kim Kulling 2020-07-16 21:37:08 +02:00
  • deddaf49df finish migrate ogrexmlserializer. Kim Kulling 2020-07-16 11:33:28 +02:00
  • df8792d24b Merge branch 'master' into gltf1_gltf2_split Kim Kulling 2020-07-16 10:45:55 +02:00
  • 44fd987d57 Merge pull request #3330 from infosia/bad_nodeanim_ptr Kim Kulling 2020-07-16 10:39:21 +02:00
  • 84e68eaf24 fix invalid pointer for bone animation Kota Iguchi 2020-07-16 15:26:02 +09:00
  • 04df5f8b1e Don't use make_unique Malcolm Tyrrell 2020-07-15 15:47:25 +01:00
  • e51e07982d Remove generic lambda usage. Malcolm Tyrrell 2020-07-15 15:05:42 +01:00
  • e1bab44e19 Exception safety Malcolm Tyrrell 2020-07-15 15:02:27 +01:00
  • 37e1fb9cd7 Fix message Malcolm Tyrrell 2020-07-15 14:19:13 +01:00
  • f3170a96ba Ensure data does not depend on faces we may not have created. Malcolm Tyrrell 2020-07-15 12:36:48 +01:00
  • d4f5f29b44 Add missing asset Malcolm Tyrrell 2020-07-15 12:22:39 +01:00
  • fff6396e3c Rename to avoid overloading problems. Malcolm Tyrrell 2020-07-15 12:22:28 +01:00
  • 212903e935 Unit test for all indices out of range, and fix. Malcolm Tyrrell 2020-07-15 12:19:00 +01:00
  • 7e7161852a Add a unit test. Malcolm Tyrrell 2020-07-15 11:19:10 +01:00
  • c0d978786e Fix warning Malcolm Tyrrell 2020-07-15 09:12:52 +01:00
  • a56134ba33 Drop faces when indices are out of range. Malcolm Tyrrell 2020-07-15 09:05:09 +01:00
  • 77cf6e3433 Ensure that zip.h warning disable is pushed awr1 2020-07-14 22:07:24 -05:00
  • 638369e995 Try to fix lexing issue with preproc w/r/t __has_warning awr1 2020-07-14 21:58:36 -05:00
  • cc8cd88d7a Preproc conditional should be &&, not || awr1 2020-07-14 21:50:22 -05:00
  • bad0df9a1a Remove unnecessary inversion in preproc awr1 2020-07-14 21:48:46 -05:00
  • b3f61f8759 Fix error where -Wunused-but-set-variable might not be available awr1 2020-07-14 21:44:33 -05:00
  • 3bf6963d20 Use a better divider for import error awr1 2020-07-14 21:34:30 -05:00
  • 93d567e3b1 Fix sprintf format string awr1 2020-07-14 21:32:22 -05:00
  • 700d8e6614 Fix MinGW builds (issues related to pragmas and format strings) awr1 2020-07-14 21:19:07 -05:00
  • 0bad2c7b6a Move library configuration outside Hunter block Rahul Sheth 2020-07-14 18:40:54 -04:00