Commit Graph

  • 75af93aaa4 Merge branch 'master' into patch-2 Jason C 2021-05-11 12:12:07 -04:00
  • 951c8a976c Merge pull request #3844 from Garux/aseHack Kim Kulling 2021-05-11 16:20:31 +02:00
  • 4ee2f5f69d Merge branch 'master' into aseHack Kim Kulling 2021-05-11 11:40:24 +02:00
  • a54cd432cd Merge branch 'master' into master Carsten Rudolph 2021-05-11 07:58:05 +02:00
  • 632e4a20a9 Utilize decltype for slightly improved syntax Salvage 2021-05-11 05:29:51 +02:00
  • 00b625a2ae [amf] Fix crash when file could not be parsed. Jason C 2021-05-10 19:01:15 -04:00
  • 7ff6144c2c Merge pull request #3881 from JC3/jc3-spam-killa Kim Kulling 2021-05-11 00:09:16 +02:00
  • cb7d3ac598 Merge branch 'master' into jc3-spam-killa Kim Kulling 2021-05-10 22:21:13 +02:00
  • cdc0bd00ce Merge pull request #3890 from JC3/jc3-importer-open-error-handling Kim Kulling 2021-05-10 22:19:52 +02:00
  • e1a0e16a4e Merge branch 'master' into jc3-importer-open-error-handling Kim Kulling 2021-05-10 22:07:25 +02:00
  • 76ccaeb42f Merge pull request #3841 from Garux/mdcOrient Kim Kulling 2021-05-10 22:06:47 +02:00
  • 4807853f09 Merge branch 'master' into mdcOrient Kim Kulling 2021-05-10 21:06:15 +02:00
  • ab43f3fefd Merge branch 'stb-image-updated' of https://github.com/krishty/assimp into stb-image-updated Krishty 2021-05-10 20:44:55 +02:00
  • d75f8bd5b0 silence warnings in stb_image.h Krishty 2021-05-10 20:44:43 +02:00
  • 433620350e Merge branch 'master' into stb-image-updated Kim Kulling 2021-05-10 11:30:45 +02:00
  • f87b180147 Merge branch 'master' into jc3-importer-open-error-handling Jason C 2021-05-09 17:02:04 -04:00
  • b30cbcf117 Merge branch 'master' into jc3-spam-killa Kim Kulling 2021-05-09 21:47:17 +02:00
  • 38dc92c5c9 Merge pull request #3880 from JC3/jc3-cctype-fixes Kim Kulling 2021-05-09 21:46:35 +02:00
  • 0f85990fe3 Merge branch 'master' into jc3-importer-open-error-handling Jason C 2021-05-09 14:42:17 -04:00
  • 5cc05c26a7 Merge branch 'master' into jc3-spam-killa Jason C 2021-05-09 14:41:39 -04:00
  • 319770db9d Merge branch 'master' into jc3-cctype-fixes Kim Kulling 2021-05-09 20:37:21 +02:00
  • 226b34bb35 Merge pull request #3850 from JC3/patch-3 Kim Kulling 2021-05-09 20:25:58 +02:00
  • 859b32c045 [Logger] Log a notification instead of silently dropping long log messages. Jason C 2021-05-07 22:32:32 -04:00
  • e37e00c51f [assimp/fast_atof] Fixed garbage in exception messages. Jason C 2021-05-07 20:21:56 -04:00
  • a19b708144 support both ktx and ktx2 ywang 2021-05-07 16:27:23 -07:00
  • 9a2a0384f4 Merge branch 'master' into patch-3 Jason C 2021-05-07 14:47:27 -04:00
  • 279e9a186f Merge branch 'master' into jc3-dnase Jason C 2021-05-07 14:49:22 -04:00
  • 6eb15080ec Merge branch 'master' into jc3-importer-open-error-handling Jason C 2021-05-07 14:49:00 -04:00
  • 2fd6102573 Merge branch 'master' into jc3-spam-killa Jason C 2021-05-07 14:48:24 -04:00
  • 7b404788a6 Merge branch 'master' into jc3-cctype-fixes Jason C 2021-05-07 14:48:01 -04:00
  • 1b33dd1965 Document AI_CONFIG_EXPORT_BLOB_NAME. Carsten Rudolph 2021-05-07 17:31:38 +02:00
  • 8ff52c0f89 Pass base name from export properties to the IO system. Carsten Rudolph 2021-05-07 17:31:30 +02:00
  • be85f238f4 Add optional blob base name to blob IO system. Carsten Rudolph 2021-05-07 17:30:58 +02:00
  • 964778cac1 Add AI_CONFIG_EXPORT_BLOB_NAME export property. Carsten Rudolph 2021-05-07 17:30:26 +02:00
  • 25a0eb0d67 Merge branch 'master' into mdcOrient Kim Kulling 2021-05-07 13:03:08 +02:00
  • d7c65d363c Merge pull request #3839 from Garux/mRootNode_mTransformation Kim Kulling 2021-05-07 11:52:44 +02:00
  • 8cae8c5461 Fix static code analysis findings Kim Kulling 2021-05-07 11:52:16 +02:00
  • 56bfa1ce5c Make constructros with one arg explicit Kim Kulling 2021-05-07 11:36:21 +02:00
  • 2b9d88c943 support basis universal ywang 2021-05-06 15:10:06 -07:00
  • 25cf5dd487 Merge branch 'master' into mRootNode_mTransformation Kim Kulling 2021-05-06 21:40:03 +02:00
  • 350f2ea1d3 Fix build and merged master. Kim Kulling 2021-05-06 21:36:25 +02:00
  • 52228a93f8 Fix X3DGeohelper. Kim Kulling 2021-05-06 21:07:38 +02:00
  • b1b937ea79 Merge pull request #3838 from Garux/fixGenNormals Kim Kulling 2021-05-06 20:40:17 +02:00
  • e120544978 Merge branch 'master' into fixGenNormals Kim Kulling 2021-05-06 17:28:37 +02:00
  • 1c90d28f9b Merge pull request #3837 from krishty/add-step-extension Kim Kulling 2021-05-06 17:25:22 +02:00
  • bc7551b778 Merge branch 'master' into add-step-extension Kim Kulling 2021-05-06 14:19:53 +02:00
  • 253fdbdeda Merge pull request #3808 from ericwa/SimpleTexturedDirectx11Fixes Kim Kulling 2021-05-06 14:19:15 +02:00
  • f53ae076a7 Merge branch 'master' into SimpleTexturedDirectx11Fixes Kim Kulling 2021-05-06 14:07:08 +02:00
  • 90d3ff27f8 Merge pull request #3806 from krishty/remove-useless-scaling-prototype Kim Kulling 2021-05-06 14:04:35 +02:00
  • 55056d11fd Add missing include Kim Kulling 2021-05-06 11:50:08 +02:00
  • 7da9c42c81 [blender] Disable creation of "dna.txt" Jason C 2021-05-05 19:30:29 -04:00
  • c08ad2e5c2 Merge branch 'master' into jc3-cctype-fixes Jason C 2021-05-05 19:04:47 -04:00
  • de5c8ece6f [xgl] Fail if file could not be parsed. Jason C 2021-05-05 17:49:10 -04:00
  • 98f586c8d4 [irr] Fail if file could not be parsed. Jason C 2021-05-05 17:48:44 -04:00
  • 470913bf27 [assbin] Fail if file could not be opened Jason C 2021-05-05 17:46:24 -04:00
  • 0d3e8b52be [sib] Fix assertion failure when file could not be opened. Jason C 2021-05-05 17:32:10 -04:00
  • a80b3b25eb [quick3d] Fix assertion failure when file could not be opened. Jason C 2021-05-05 17:31:50 -04:00
  • e52c297284 [nendo] Fix assertion failure when file could not be opened. Jason C 2021-05-05 17:31:24 -04:00
  • 1cd3752ec6 [ms3d] Fix assertion failure when file could not be opened. Jason C 2021-05-05 17:31:06 -04:00
  • 7f13387487 [cob] Fix assertion failure when file could not be opened. Jason C 2021-05-05 17:30:29 -04:00
  • 116ebf6e10 [3ds] Fix assertion failure when file could not be opened Jason C 2021-05-05 17:30:05 -04:00
  • 6c7ee61f14 Merge branch 'stb-image-updated' of https://github.com/krishty/assimp into stb-image-updated Krishty 2021-05-05 23:15:59 +02:00
  • 816da9b677 merge and update all copies of stb_image.h Krishty 2021-05-05 23:05:44 +02:00
  • 785cca1bb4 [amf] Fix crash when file could not be parsed. Jason C 2021-05-05 17:13:10 -04:00
  • 24df52647f merge and update all copies of stb_image.h Krishty 2021-05-05 23:05:44 +02:00
  • f5a31b70f5 Merge branch 'master' into patch-3 Jason C 2021-05-05 16:24:46 -04:00
  • 992f10e7bf Merge branch 'master' into remove-useless-scaling-prototype Kim Kulling 2021-05-05 21:54:31 +02:00
  • 7ae8a52d9f Merge branch 'master' into jc3-spam-killa Jason C 2021-05-05 10:33:29 -04:00
  • b82d9f4bc7 Merge branch 'master' into new-file-detection Kim Kulling 2021-05-05 15:59:25 +02:00
  • 1e89c06157 Merge pull request #3882 from assimp/optimize_3mf_strings Kim Kulling 2021-05-05 15:56:14 +02:00
  • 5325b327c3 Merge branch 'master' into optimize_3mf_strings Kim Kulling 2021-05-05 15:12:06 +02:00
  • 3f5c3eb38c Delete dna.txt Kim Kulling 2021-05-05 15:11:36 +02:00
  • 067993d607 Delete dae.dae Kim Kulling 2021-05-05 15:11:20 +02:00
  • 0aadd8a3f9 Delete spiderExport.stl Kim Kulling 2021-05-05 15:10:59 +02:00
  • d1991ad949 Delete AssimpLog_Cpp.txt Kim Kulling 2021-05-05 15:10:50 +02:00
  • e683c6eef9 Delete testExport.stl Kim Kulling 2021-05-05 15:10:30 +02:00
  • 9395322e56 Delete AssimpLog_C.txt Kim Kulling 2021-05-05 15:10:22 +02:00
  • 153b890b02 Prevent accessing nullpointers Max Vollmer (Microsoft Havok) 2021-05-05 14:09:43 +01:00
  • 2a6b84c8ea - closes https://github.com/assimp/assimp/issues/3830 - Fix rgba2hex - Add tests kkulling 2021-05-05 14:43:51 +02:00
  • d5cde96fbd Merge branch 'new-file-detection' of https://github.com/krishty/assimp into new-file-detection Krishty 2021-05-05 13:14:35 +02:00
  • b546dfccc7 fix for 0f3e6e2941 Krishty 2021-05-05 13:14:25 +02:00
  • f15dcfa981 - Fix model parsing kkulling 2021-05-05 13:10:52 +02:00
  • cbce6d3dad Merge branch 'optimize_3mf_strings' of https://github.com/assimp/assimp into optimize_3mf_strings kkulling 2021-05-05 10:46:54 +02:00
  • 6dcbd0d566 Merge branch 'master' into new-file-detection Kim Kulling 2021-05-05 09:37:52 +02:00
  • 6e65115253 [assimp/xml] Improved XML parse error message. Jason C 2021-05-04 21:10:02 -04:00
  • ccd1a4455e [ply] Fix minor typo in error message. Jason C 2021-05-04 21:14:39 -04:00
  • a03dc4edaa [amf] Fix minor typo in error message. Jason C 2021-05-04 20:45:08 -04:00
  • f8609c2c2d [opengex] Direct OpenDDLParser log messages to assimp logger Jason C 2021-05-04 03:32:49 -04:00
  • 558457e5bf [openddlparser] Remove default log handler and unsolicited output. Jason C 2021-05-04 03:04:12 -04:00
  • 9a04f5d4b0 Fix garbage messages in SIB, MD2, and MDC loaders. Jason C 2021-05-04 21:24:44 -04:00
  • a9fb1e56ae Add ai_str_toprintable; fixed garbage messages in HMP, MDL, Q3D loaders. Jason C 2021-05-04 19:16:23 -04:00
  • c8ad8c6017 [mmd] Remove stderr spam. Jason C 2021-05-04 04:15:17 -04:00
  • deca47225f Merge branch 'new-file-detection' of https://github.com/krishty/assimp into new-file-detection Krishty 2021-05-05 00:59:20 +02:00
  • ae93f53b51 fixed signature-based detection on unknown extensions Krishty 2021-05-05 00:57:43 +02:00
  • b79b84d34e Merge branch 'master' into new-file-detection Krishty 2021-05-05 00:09:42 +02:00
  • 0f3e6e2941 replaced std::size() with AI_COUNT_OF for pre-C++20 compilers Krishty 2021-05-05 00:08:54 +02:00
  • 200086c4c5 [assimp_view] Make sure ctype calls use unsigned char. Jason C 2021-05-04 17:26:17 -04:00
  • 7dd7a053a9 [gtest] Fixed a rogue std::isalnum Jason C 2021-05-04 17:25:45 -04:00
  • 1ec8d4b6cf [draco] Make sure ctype calls use unsigned char. Jason C 2021-05-04 17:22:44 -04:00
  • 2925592c64 [assimp] Make sure ctype calls use unsigned char. Jason C 2021-05-04 04:55:08 -04:00