Commit Graph

12162 Commits

Author SHA1 Message Date
Kim Kulling
a5bb4b59e4 Merge branch 'master' into irrfix 2023-07-03 11:19:53 +02:00
Kim Kulling
0dcfe2f72c Merge pull request #5167 from assimp/kimkulling/add_missing_licence_issue-5144
Create licence.md
2023-07-03 10:04:34 +02:00
Kim Kulling
d1ad4e54d7 Create licence.md
- closes https://github.com/assimp/assimp/issues/5144
2023-07-03 08:26:50 +02:00
Kim Kulling
5770faac10 Merge pull request #5162 from feuerste/py_available_formats
[pyassimp] Replace static list of file extensions with the actually supported ones.
2023-07-02 21:26:07 +02:00
PencilAmazing
f1561f03ce Merge branch 'master' into irrfix 2023-07-02 15:10:04 -04:00
PencilAmazing
57306bcd63 Make unit test more useful in case importer breaks again 2023-07-02 14:55:25 -04:00
PencilAmazing
96eb87265e Apply clang-format to unit test 2023-07-02 14:35:22 -04:00
PencilAmazing
0bacc7134d Remove debugging code, clean up some notes 2023-07-02 14:32:17 -04:00
PencilAmazing
19da9cc84d Port mesh loading to pugixml. Untested. 2023-07-02 14:32:12 -04:00
dog
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.
2023-07-02 14:30:54 -04:00
Kim Kulling
7d542eb795 Merge branch 'master' into py_available_formats 2023-07-02 20:26:16 +02:00
PencilAmazing
537b445a59 Apply clang-format to files 2023-07-02 14:17:52 -04:00
Alex
6f3bfb5b60 Fix memory leak 2023-07-02 14:12:49 -04:00
Alex
3838a8aaf8 Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue 2023-07-02 14:12:49 -04:00
Kim Kulling
e4cac7d00b Merge pull request #5153 from feuerste/blender_can_read
Unify way to check readable blender files.
2023-07-01 13:14:55 +02:00
Kim Kulling
8a65dcc19e Merge branch 'master' into blender_can_read 2023-07-01 12:54:45 +02:00
Kim Kulling
42386b829c Merge pull request #5164 from feuerste/py_read_from_memory
[pyassimp] Fix passing of file extension string.
2023-06-30 00:55:27 +02:00
Kim Kulling
b44dfd5ecf Merge branch 'master' into py_read_from_memory 2023-06-29 21:08:25 +02:00
Kim Kulling
b61fc49c30 Merge pull request #5163 from thegeeko/fix-gcc-13
Fix: disabled dangling-reference warning in gcc13
2023-06-29 21:07:27 +02:00
Marco Feuerstein
82d3f47432 Unify way to check readable blender files. 2023-06-29 15:10:28 +02:00
Marco Feuerstein
b2cad5c58d Use file system encoding. 2023-06-29 14:56:11 +02:00
Marco Feuerstein
d1edaa949b Fix passing of file extension string.
Previously only the first letter of the string was passed to c, now it passes the whole extension.
2023-06-29 14:51:16 +02:00
Abdelhadi
ac2cf2f71b Fix: disabled dangling-reference warning in gcc13 2023-06-29 10:02:39 +03:00
Marco Feuerstein
59f2620164 Remove unneeded check for empty extension. 2023-06-29 08:21:09 +02:00
Marco Feuerstein
261c7769b8 Replace static list of supported file extensions with the actually supported ones. 2023-06-29 08:21:08 +02:00
Kim Kulling
03934128fc Merge pull request #5149 from mosfet80/UpdatePugiXml
show correct pugixml version
2023-06-28 16:31:48 +02:00
Kim Kulling
7ae88225b3 Merge branch 'master' into UpdatePugiXml 2023-06-28 16:04:49 +02:00
Kim Kulling
5a568d485c Merge pull request #5147 from mosfet80/UpdateZli
switch to zlib 1.2.13
2023-06-28 16:02:25 +02:00
Kim Kulling
507a3d2f8d Merge branch 'master' into UpdateZli 2023-06-28 13:06:59 +02:00
Kim Kulling
876b1a0d6e Merge pull request #5151 from severin-lemaignan/master
[pyassimp] bumped pyassimp version to 5.2.5
2023-06-28 11:40:49 +02:00
Kim Kulling
c9111fe89a Merge branch 'master' into master 2023-06-28 11:24:58 +02:00
Kim Kulling
e7a0985886 Merge pull request #5148 from mosfet80/UpdateUtf8cpp
update utf8 from 2.3.4 to 3.2.3
2023-06-28 11:24:16 +02:00
Kim Kulling
f55eebad06 Merge branch 'master' into UpdateUtf8cpp 2023-06-27 22:09:20 +02:00
Kim Kulling
8f61427880 Merge pull request #5128 from sashashura/5093294573486080
Fix UNKNOWN READ in Assimp::MDLImporter::ParseSkinLump_3DGS_MDL7
2023-06-27 22:08:29 +02:00
Kim Kulling
1ec3dbd11a Merge branch 'master' into 5093294573486080 2023-06-27 17:04:58 +02:00
Kim Kulling
1791eac7ff Merge pull request #5140 from emaame/SupportOBJSpecifiedOnlyAPartOfVertexColors
Fix Objimported supports OBJ partially specified vertex colors
2023-06-27 16:53:46 +02:00
mosfet80
3da92e05eb Merge branch 'assimp:master' into UpdateUtf8cpp 2023-06-27 16:27:25 +02:00
Kim Kulling
f24224fdc5 Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors 2023-06-27 13:44:31 +02:00
Kim Kulling
d2411a7ecd Merge pull request #5127 from sashashura/5921493454815232
Fix Bad-cast to Assimp::D3DS::Material from invalid vptr in Assimp::ASE::Parser::ParseLV2MaterialBlock
2023-06-27 13:43:03 +02:00
Kim Kulling
db6c1a8b1c Merge branch 'master' into 5921493454815232 2023-06-27 11:03:50 +02:00
Kim Kulling
8937248f7c Merge pull request #5126 from sashashura/5143879191494656
Fix UNKNOWN WRITE in std::__1::list<Assimp::LWO::Envelope, std::__1::allocator<Assimp::LWO::Envelope>
2023-06-27 11:02:07 +02:00
Kim Kulling
ef6bf03acd Merge branch 'master' into 5143879191494656 2023-06-27 10:23:36 +02:00
Kim Kulling
27c4de3419 Merge pull request #5122 from sashashura/5407417422970880
Fix Heap-buffer-overflow READ in Assimp::MD5::MD5Parser::ParseSection
2023-06-27 10:22:46 +02:00
Kim Kulling
141e278e1f Merge branch 'master' into 5407417422970880 2023-06-27 10:07:21 +02:00
Kim Kulling
41e2b0f5dc Merge pull request #5121 from sashashura/6521292621217792
Fix Memcpy-param-overlap in unzReadCurrentFile
2023-06-26 23:51:36 +02:00
Kim Kulling
1830a8aad2 Fix; fix old declaration style
- fix compiler warning.
2023-06-26 23:36:20 +02:00
Kim Kulling
47575f759f Update unzip.c
- Fix compiler warnings
2023-06-26 16:08:12 +02:00
Kim Kulling
ff36ea7e23 Merge branch 'master' into 6521292621217792 2023-06-26 09:17:40 +02:00
Kim Kulling
bce2fdbbe9 Merge pull request #5119 from sashashura/4508318827937792
Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue
2023-06-26 09:02:39 +02:00
Kim Kulling
b1181b1086 Merge branch 'master' into 4508318827937792 2023-06-25 21:20:02 +02:00