Commit Graph

6878 Commits

Author SHA1 Message Date
tanolino
24d110199a Use size_t for file size instead of unsigned int
This is one step to help us open files with more then 4 GB size.
2022-07-08 10:19:50 +02:00
Kim Kulling
e254f80a3a Fix memory leak in D3MFOpcPackage
- closes https://github.com/assimp/assimp/issues/4628
2022-07-08 10:17:11 +02:00
Kim Kulling
e59b8fb448 Fix typo 2022-07-08 09:50:04 +02:00
Kim Kulling
70b2db19a8 Remove assertion test
- Code cleanup
- closes https://github.com/assimp/assimp/issues/4626
2022-07-08 09:47:33 +02:00
Kim Kulling
e9b08f35b2 Merge branch 'master' into master 2022-07-07 13:21:08 +02:00
Kim Kulling
77a2cdee76 Fix texture fetch for embedded textures in 3mf-files. 2022-07-06 20:59:42 +02:00
Kim Kulling
eeae6eac26 Update Q3DLoader.cpp 2022-07-05 23:01:18 +02:00
Kim Kulling
2d994e1a28 Fix possible bad_alloc exception for invalid file
- Fuzzer finding
- closes https://github.com/assimp/assimp/issues/3417
2022-07-05 22:50:54 +02:00
Kim Kulling
90b75cd6e7 Merge branch 'master' into fix/collada_empty_animation_name 2022-07-05 20:39:19 +02:00
Kim Kulling
5bce9e8ce5 Update MDLMaterialLoader.cpp 2022-07-05 20:09:16 +02:00
Kim Kulling
a6b1a35748 Try to fix issue 4238
- Fix possible nullptr dereferencing.
- closes https://github.com/assimp/assimp/issues/4238
2022-07-05 20:05:10 +02:00
Kim Kulling
6d26e91fc1 Merge branch 'master' into fix/collada_empty_animation_name 2022-07-05 09:28:39 +02:00
Kim Kulling
636d8bffe5 Merge branch 'master' into kimkulling/fix_memleak_in_xmlparser 2022-07-02 21:32:24 +02:00
Kim Kulling
9063216893 Fix a memory leak 2022-07-02 21:21:31 +02:00
Kim Kulling
55625d1af5 Use mingw.include 2022-06-30 20:58:34 +02:00
Luca Della Vedova
0924c4710b Fix nested animation name being lost in Collada
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-06-29 11:09:54 +08:00
kimmi
d3c8201614 Fix token match string checks. 2022-06-28 20:31:03 +02:00
Kim Kulling
5598356157 Merge branch 'master' into master 2022-06-24 09:56:09 +02:00
Kim Kulling
855537f232 Merge branch 'master' into master 2022-06-24 09:04:37 +02:00
Kim Kulling
be2e6a1b24 Merge branch 'master' into w32fix 2022-06-24 08:31:41 +02:00
Onur Berk Töre
b392ff5ad1 Merge branch 'master' into otore19/sandbox 2022-06-21 21:34:50 +03:00
Onur Berk Tore
4f06c41802 Fix: Collada header updated 2022-06-21 21:08:11 +03:00
Gargaj
bca5650578 fix windows 32 bit builds 2022-06-21 13:40:49 +02:00
Kim Kulling
fff74a4ac0 Merge branch 'master' into patch-2 2022-06-21 13:39:23 +02:00
Onur Berk Tore
c2060a1f7e Deletion: Removed unnessary header 2022-06-20 23:48:00 +03:00
Onur Berk Tore
1b53f41787 Feature: Utilizes removeEmptyBones flag for Collada 2022-06-20 23:46:29 +03:00
kovacsv
2486a681c1 Remove unused variable. 2022-06-20 21:07:34 +02:00
PercentBoat4164
487a9aca2f Add support for GCC v12 2022-06-16 19:23:55 -04:00
Luca Della Vedova
079b7deb33 Merge branch 'master' of https://github.com/assimp/assimp into fix/collada_parser_sid 2022-06-13 10:20:46 +08:00
hgdagon
ce8081bd0a Merge branch 'master' into master 2022-06-13 00:15:31 +04:00
Kim Kulling
5adea2dbcf Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-06-11 21:40:44 +02:00
Kim Kulling
aaa19903c6 Fix merge conflicts 2022-06-11 18:50:18 +02:00
Kim Kulling
02b0c89fa4 Fix usage of validation 2022-06-08 00:10:13 +02:00
Kim Kulling
4fb5cf4ba6 Fix possible nullptr exception
- closes https://github.com/assimp/assimp/issues/4418
2022-06-07 23:33:56 +02:00
Kim Kulling
e7daa5759b Merge branch 'master' into master 2022-06-07 22:01:00 +02:00
Matthew Clendening
aca02190a7 Merge branch 'master' into fix_FBXConverter_double_precision 2022-06-06 10:01:13 -04:00
Kim Kulling
680ea6b0e0 Merge branch 'master' into fix_fbx 2022-06-03 11:21:41 +02:00
Kim Kulling
39a4627519 Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-06-02 21:47:29 +02:00
Kim Kulling
638fda66da Merge branch 'master' into issue4516 2022-06-01 20:47:13 +02:00
nsg
96d2052ed0 Merge branch 'master' into fix_fbx 2022-06-02 02:31:32 +09:00
Kim Kulling
03532eaec3 Merge branch 'master' into msvcfix 2022-06-01 17:11:06 +02:00
Underdisc
17289985a4 Update comment 2022-06-01 12:45:40 +02:00
Underdisc
02e0d1d05c Remove dllexport tags from static library builds. 2022-06-01 12:26:04 +02:00
nsg
681eb3e91e Fix Import a specific FBX model 2022-06-01 17:41:27 +09:00
Kim Kulling
b7a70ac707 Add compiler switgxh for using static linkage for std_image 2022-05-31 23:24:31 +02:00
Kim Kulling
05867f4752 Merge branch 'kimkulling/link_stb_image_statically_issue_4467' of https://github.com/assimp/assimp into kimkulling/link_stb_image_statically_issue_4467 2022-05-31 20:08:39 +02:00
Kim Kulling
de4fe01c94 Fix clang build 2022-05-31 20:08:26 +02:00
Kim Kulling
e28becbaf5 Update Assimp.cpp 2022-05-31 19:17:08 +02:00
Kim Kulling
e5cd85ac0c Update M3DWrapper.h 2022-05-31 19:16:46 +02:00
Kim Kulling
4b25eb6c4b Update Assimp.cpp 2022-05-31 19:09:22 +02:00