Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,298 Commits 19 Branches 43 Tags
2b804c638f3aefab7e55afbadcfe2ada4cbdb5ef
Commit Graph

1034 Commits

Author SHA1 Message Date
Bengt Rosenberger
2b804c638f Merge branch 'master' into gltf2_metadata_export 2022-07-25 21:48:46 +02:00
Kim Kulling
73542f3830 Merge branch 'master' into patch-2 2022-07-24 12:11:18 +02:00
Bengt Rosenberger
bdee65e577 Got rid of gltf2::ExtrasValue and used gltf2::CustomExtension instead 2022-07-22 01:33:05 +02:00
Bengt Rosenberger
517fd3c76c Added missing member copy in gltf2::ExtrasValue ctor. 2022-07-22 01:07:42 +02:00
Bengt Rosenberger
5a2b811ba3 Fixed extras presence check in gltf2 import. 2022-07-22 01:04:05 +02:00
Bengt Rosenberger
417481d17f Rewrote gltf2 node extras import and added node extras export. 
No support for AI_AIVECTOR3D metadata type. No support for json arrays of metadata, just json objects.
 2022-07-22 00:44:51 +02:00
Kim Kulling
f07bc2c5b9 Merge branch 'master' into patch-3 2022-07-18 15:19:27 +02:00
Kim Kulling
05ececc387 Merge branch 'master' into patch-4 2022-07-18 14:06:29 +02:00
sashashura
9ddc3a64d7 Fixes Crash in Assimp::ObjFileMtlImporter::getFloatValue 2022-07-16 13:55:08 +01:00
sashashura
772cfdc757 Fixes Heap-buffer-overflow in Assimp::ObjFileParser::getFace 2022-07-16 13:50:54 +01:00
sashashura
94c0e9d890 Fixes Heap-buffer-overflow in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch 2022-07-16 13:48:39 +01:00
sashashura
a4274930e4 Fixes Heap-use-after-free in Assimp::DXFImporter::ExpandBlockReferences 2022-07-16 13:46:50 +01:00
Kim Kulling
6ad8ea395a Merge branch 'master' into fix_stl_for_over_4GB 2022-07-09 09:58:10 +02:00
tanolino
c23146bb20 Use size_t for the file size in cpp file 
This pointer juggling in combination with STL files >4GB caused some nasty illegal memory access bugs here. So let's fix it.
 2022-07-08 10:26:03 +02:00
Kim Kulling
c5dfcac08a Update D3MFOpcPackage.cpp 2022-07-08 10:25:40 +02:00
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
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
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
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
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
Matthew Clendening
aca02190a7 Merge branch 'master' into fix_FBXConverter_double_precision 2022-06-06 10:01:13 -04:00
Kim Kulling
39a4627519 Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-06-02 21:47:29 +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
nsg
681eb3e91e Fix Import a specific FBX model 2022-06-01 17:41:27 +09:00
Kim Kulling
e5cd85ac0c Update M3DWrapper.h 2022-05-31 19:16:46 +02:00
Kim Kulling
472e15c405 Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467 2022-05-31 17:47:43 +02:00
Gargaj
f612865f22 fix msvc warnings-as-errors 2022-05-29 01:35:48 +02:00