Commit Graph

  • 37a1366fb7 Add missing rapidjson headers. Marco Feuerstein 2023-07-21 11:30:21 +02:00
  • 52e5c3f39e Fix violation of strict aliasing rule. Marco Feuerstein 2023-07-21 09:48:45 +02:00
  • 64e0ba2625 Merge branch 'master' into sfjohnston_mods Kim Kulling 2023-07-20 09:21:13 +00:00
  • bf7ccb6206 Merge pull request #5182 from tellypresence/fix_malformed_irr_files Kim Kulling 2023-07-18 14:29:08 +00:00
  • a5a4090989 Merge branch 'master' into fix_malformed_irr_files Kim Kulling 2023-07-18 12:31:44 +00:00
  • 8c871ed4f0 Merge pull request #5183 from SirLynix/patch-2 Kim Kulling 2023-07-17 17:05:16 +02:00
  • 46be2d3380 Remove /WX from CMakeLists for MSVC Jérôme Leclercq 2023-07-15 15:54:15 +02:00
  • ca7f6de671 Merge branch 'master' into fix_malformed_irr_files Steve M 2023-07-14 20:40:56 -07:00
  • 3161f0e754 Introduce alternate versions with animations disabled to allow sucessful load Steve M 2023-07-14 20:19:28 -07:00
  • 5b7ff294b8 Merge pull request #5156 from feuerste/cloud_storage_version Kim Kulling 2023-07-14 15:07:12 +02:00
  • 16021ef9ac Merge branch 'master' into cloud_storage_version Kim Kulling 2023-07-14 11:47:24 +02:00
  • 0e7cd18c8b Strip aws gcs version string. Marco Feuerstein 2023-07-14 09:37:48 +02:00
  • f66a7fd6bf Merge pull request #5176 from feuerste/gltf_specular Kim Kulling 2023-07-14 09:23:12 +02:00
  • 1e6c7063b6 Fix typos Steve M 2023-07-13 20:28:48 -07:00
  • bf38d67935 Fix detection of KHR_materials_specular. Marco Feuerstein 2023-07-13 11:51:56 +02:00
  • cf7d363766 Merge pull request #5159 from mosfet80/patch-4 Kim Kulling 2023-07-11 15:45:55 +02:00
  • 11f024b395 Merge branch 'master' into patch-4 Kim Kulling 2023-07-11 10:19:38 +02:00
  • 53846430ce Merge pull request #5157 from feuerste/file_extension Kim Kulling 2023-07-11 10:18:49 +02:00
  • c7afea3cd7 Merge branch 'assimp:master' into sfjohnston_mods sfjohnston 2023-07-10 07:58:21 -07:00
  • e2b19ef776 Merge branch 'master' into file_extension Kim Kulling 2023-07-10 11:19:27 +02:00
  • fe49a9ed94 Merge pull request #5155 from feuerste/alpha_graph Kim Kulling 2023-07-10 11:17:16 +02:00
  • 87cac888e4 More simplifications. Marco Feuerstein 2023-07-04 13:18:22 +02:00
  • bdde968677 Address reviewer comment. Marco Feuerstein 2023-07-04 12:29:17 +02:00
  • 506baa21e6 Unify extension check for importers. Marco Feuerstein 2023-07-04 09:25:45 +02:00
  • 0256047168 Extend token search flag from alpha to graph. Marco Feuerstein 2023-06-22 14:04:21 +02:00
  • 3423949490 Merge branch 'master' into master Kim Kulling 2023-07-08 12:37:42 +02:00
  • e08cb0b5b8 Merge pull request #5172 from feuerste/missing_header Kim Kulling 2023-07-08 12:36:52 +02:00
  • 668db327f4 Fix misplaced quote PencilAmazing 2023-07-07 13:27:45 -04:00
  • 8b005eaa83 Add missing header. Marco Feuerstein 2023-07-07 14:28:05 +02:00
  • 6308de6e5b Merge pull request #5154 from feuerste/gltf_binary Kim Kulling 2023-07-05 21:29:38 +02:00
  • 90ff723b6c Merge branch 'master' into gltf_binary Kim Kulling 2023-07-03 21:31:28 +02:00
  • 9a94b26cdc Merge pull request #5168 from sashashura/4879958521806848 Kim Kulling 2023-07-03 21:08:11 +02:00
  • ed903543a7 Merge branch 'master' into 4879958521806848 Kim Kulling 2023-07-03 19:50:38 +02:00
  • d3ee157342 Merge pull request #5166 from PencilAmazing/irrfix Kim Kulling 2023-07-03 11:36:52 +02:00
  • a5bb4b59e4 Merge branch 'master' into irrfix Kim Kulling 2023-07-03 11:19:53 +02:00
  • 093e35dd54 Fix eternal loop Alex 2023-07-03 09:12:00 +00:00
  • edb8375702 Fix integer overflow Alex 2023-07-03 09:11:38 +00:00
  • 0dcfe2f72c Merge pull request #5167 from assimp/kimkulling/add_missing_licence_issue-5144 Kim Kulling 2023-07-03 10:04:34 +02:00
  • d1ad4e54d7 Create licence.md Kim Kulling 2023-07-03 08:26:50 +02:00
  • 5770faac10 Merge pull request #5162 from feuerste/py_available_formats Kim Kulling 2023-07-02 21:26:07 +02:00
  • f1561f03ce Merge branch 'master' into irrfix PencilAmazing 2023-07-02 15:10:04 -04:00
  • 57306bcd63 Make unit test more useful in case importer breaks again PencilAmazing 2023-07-02 14:55:25 -04:00
  • 96eb87265e Apply clang-format to unit test PencilAmazing 2023-07-02 14:35:22 -04:00
  • 0bacc7134d Remove debugging code, clean up some notes PencilAmazing 2023-06-30 19:57:09 -04:00
  • 19da9cc84d Port mesh loading to pugixml. Untested. PencilAmazing 2023-06-29 16:21:52 -04:00
  • 3e1fd74940 Fix up scene loading. pugixml is a breadth-first parser while irrxml is a depth first. This only parses scene structure, no mesh loading yet. dog 2023-06-26 15:15:30 -04:00
  • 7d542eb795 Merge branch 'master' into py_available_formats Kim Kulling 2023-07-02 20:26:16 +02:00
  • 537b445a59 Apply clang-format to files PencilAmazing 2023-07-02 14:17:52 -04:00
  • 6f3bfb5b60 Fix memory leak Alex 2023-06-02 11:34:07 +00:00
  • 3838a8aaf8 Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue Alex 2023-06-02 11:33:54 +00:00
  • e4cac7d00b Merge pull request #5153 from feuerste/blender_can_read Kim Kulling 2023-07-01 13:14:55 +02:00
  • 8a65dcc19e Merge branch 'master' into blender_can_read Kim Kulling 2023-07-01 12:54:45 +02:00
  • 3e74453b69 Merge branch 'master' into gltf_binary Kim Kulling 2023-06-30 11:16:08 +02:00
  • 42386b829c Merge pull request #5164 from feuerste/py_read_from_memory Kim Kulling 2023-06-30 00:55:27 +02:00
  • b44dfd5ecf Merge branch 'master' into py_read_from_memory Kim Kulling 2023-06-29 21:08:25 +02:00
  • b61fc49c30 Merge pull request #5163 from thegeeko/fix-gcc-13 Kim Kulling 2023-06-29 21:07:27 +02:00
  • 82d3f47432 Unify way to check readable blender files. Marco Feuerstein 2023-06-29 15:10:28 +02:00
  • b2cad5c58d Use file system encoding. Marco Feuerstein 2023-06-29 14:56:11 +02:00
  • d1edaa949b Fix passing of file extension string. Marco Feuerstein 2023-06-29 14:51:16 +02:00
  • ac2cf2f71b Fix: disabled dangling-reference warning in gcc13 Abdelhadi 2023-06-29 10:02:39 +03:00
  • 59f2620164 Remove unneeded check for empty extension. Marco Feuerstein 2023-06-28 08:20:49 +02:00
  • 261c7769b8 Replace static list of supported file extensions with the actually supported ones. Marco Feuerstein 2023-06-27 21:25:11 +02:00
  • 2875de132f Fix compilation on windows. Marco Feuerstein 2023-06-29 08:17:08 +02:00
  • 17fac97b04 Fix magic token usage. Marco Feuerstein 2023-06-26 15:18:31 +02:00
  • 1c0f3c5f87 Fix string length calculation. Marco Feuerstein 2023-06-26 14:21:10 +02:00
  • a2bdfdd05a Improve binary check for gltf and gltf2. Marco Feuerstein 2023-06-22 13:58:51 +02:00
  • 03934128fc Merge pull request #5149 from mosfet80/UpdatePugiXml Kim Kulling 2023-06-28 16:31:48 +02:00
  • 7ae88225b3 Merge branch 'master' into UpdatePugiXml Kim Kulling 2023-06-28 16:04:49 +02:00
  • 5a568d485c Merge pull request #5147 from mosfet80/UpdateZli Kim Kulling 2023-06-28 16:02:25 +02:00
  • 507a3d2f8d Merge branch 'master' into UpdateZli Kim Kulling 2023-06-28 13:06:59 +02:00
  • 876b1a0d6e Merge pull request #5151 from severin-lemaignan/master Kim Kulling 2023-06-28 11:40:49 +02:00
  • c9111fe89a Merge branch 'master' into master Kim Kulling 2023-06-28 11:24:58 +02:00
  • e7a0985886 Merge pull request #5148 from mosfet80/UpdateUtf8cpp Kim Kulling 2023-06-28 11:24:16 +02:00
  • f55eebad06 Merge branch 'master' into UpdateUtf8cpp Kim Kulling 2023-06-27 22:09:20 +02:00
  • 8f61427880 Merge pull request #5128 from sashashura/5093294573486080 Kim Kulling 2023-06-27 22:08:29 +02:00
  • 1ec3dbd11a Merge branch 'master' into 5093294573486080 Kim Kulling 2023-06-27 17:04:58 +02:00
  • 1791eac7ff Merge pull request #5140 from emaame/SupportOBJSpecifiedOnlyAPartOfVertexColors Kim Kulling 2023-06-27 16:53:46 +02:00
  • 3da92e05eb Merge branch 'assimp:master' into UpdateUtf8cpp mosfet80 2023-06-27 16:27:25 +02:00
  • f24224fdc5 Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors Kim Kulling 2023-06-27 13:44:31 +02:00
  • d2411a7ecd Merge pull request #5127 from sashashura/5921493454815232 Kim Kulling 2023-06-27 13:43:03 +02:00
  • 5d3f3281f4 fix incorrect default for material::get with aiColor3D Tomas Maly 2023-06-27 12:40:27 +02:00
  • db6c1a8b1c Merge branch 'master' into 5921493454815232 Kim Kulling 2023-06-27 11:03:50 +02:00
  • 8937248f7c Merge pull request #5126 from sashashura/5143879191494656 Kim Kulling 2023-06-27 11:02:07 +02:00
  • ef6bf03acd Merge branch 'master' into 5143879191494656 Kim Kulling 2023-06-27 10:23:36 +02:00
  • 27c4de3419 Merge pull request #5122 from sashashura/5407417422970880 Kim Kulling 2023-06-27 10:22:46 +02:00
  • 141e278e1f Merge branch 'master' into 5407417422970880 Kim Kulling 2023-06-27 10:07:21 +02:00
  • 41e2b0f5dc Merge pull request #5121 from sashashura/6521292621217792 Kim Kulling 2023-06-26 23:51:36 +02:00
  • 1830a8aad2 Fix; fix old declaration style Kim Kulling 2023-06-26 23:36:20 +02:00
  • 47575f759f Update unzip.c Kim Kulling 2023-06-26 16:08:12 +02:00
  • ff36ea7e23 Merge branch 'master' into 6521292621217792 Kim Kulling 2023-06-26 09:17:40 +02:00
  • bce2fdbbe9 Merge pull request #5119 from sashashura/4508318827937792 Kim Kulling 2023-06-26 09:02:39 +02:00
  • b1181b1086 Merge branch 'master' into 4508318827937792 Kim Kulling 2023-06-25 21:20:02 +02:00
  • 96d0c0769e Merge pull request #5120 from sashashura/6520123362508800 Kim Kulling 2023-06-25 21:19:19 +02:00
  • 7005a9caa2 Merge branch 'master' into 6520123362508800 Kim Kulling 2023-06-25 21:07:34 +02:00
  • ed0dff2a7e Merge pull request #5117 from sashashura/6091762766839808 Kim Kulling 2023-06-25 21:03:23 +02:00
  • 6b1a2e91d5 Merge branch 'master' into 6091762766839808 Kim Kulling 2023-06-25 20:08:45 +02:00
  • 4a658202ca Merge pull request #5113 from sashashura/6020769077657600 Kim Kulling 2023-06-25 20:06:47 +02:00
  • 438f9fe568 Merge branch 'master' into 6020769077657600 Kim Kulling 2023-06-25 18:11:54 +02:00
  • 1477f696e0 Merge pull request #5111 from sashashura/5781186265350144 Kim Kulling 2023-06-25 18:11:25 +02:00
  • 3545aab937 Merge branch 'master' into 5781186265350144 Kim Kulling 2023-06-25 17:51:01 +02:00