Commit Graph

12783 Commits

Author SHA1 Message Date
Kim Kulling
0513eff44f Merge branch 'master' into kimkulling/waveform_obj_optimizations 2022-07-30 13:15:42 +02:00
Kim Kulling
f6bcb160d0 Improvements of obj-parsers. 2022-07-30 12:58:09 +02:00
Kim Kulling
75e678a0c5 Merge pull request #4656 from waebbl/update-version-tag
Update version tag
2022-07-30 09:31:14 +02:00
Bernd Waibel
fb653e8381 Update version tag
Closes: https://github.com/assimp/assimp/issues/4655
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
2022-07-29 23:10:42 +02:00
Kim Kulling
46aa7a548c Merge pull request #4632 from enginmanap/master
Fix warnings that are causing build fails with specific build flags
2022-07-29 21:20:07 +02:00
Kim Kulling
340d800739 Merge branch 'master' into master 2022-07-29 20:42:56 +02:00
Kim Kulling
8abacebad7 Merge pull request #4635 from Koekto-code/Koekto-code-patch-1
Fix mingw include in assimp_cmd.rc
2022-07-29 20:37:34 +02:00
Kim Kulling
173fad738f Merge branch 'master' into Koekto-code-patch-1 2022-07-29 19:54:41 +02:00
Kim Kulling
cb43690aad Merge pull request #4538 from luca-della-vedova/fix/collada_parser_sid
ColladaParser - Store sid in mSID field
2022-07-29 19:47:57 +02:00
Kim Kulling
4f6640278a Merge branch 'master' into fix/collada_parser_sid 2022-07-29 19:17:43 +02:00
Kim Kulling
53a4b43ec1 Merge pull request #4643 from sashashura/patch-1
Fixes Heap-buffer-overflow in SuperFastHash
2022-07-29 19:15:58 +02:00
Kim Kulling
b0210cb3cf Merge branch 'master' into patch-1 2022-07-29 17:48:14 +02:00
Bengt Rosenberger
2b804c638f Merge branch 'master' into gltf2_metadata_export 2022-07-25 21:48:46 +02:00
Engin Manap
7c75a4c59b Merge branch 'master' into master 2022-07-24 12:31:36 -07:00
Kim Kulling
3c253ca3e5 Merge pull request #4644 from sashashura/patch-2
Fixes Heap-use-after-free in Assimp::DXFImporter::ExpandBlockReferences
2022-07-24 12:23:34 +02:00
Kim Kulling
73542f3830 Merge branch 'master' into patch-2 2022-07-24 12:11:18 +02:00
Kim Kulling
9bd2b4da50 Merge pull request #4645 from sashashura/patch-3
Fixes Heap-buffer-overflow in std::__1::basic_string<char, std::__1::…
2022-07-24 12:08:51 +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
749fe898b1 Merge pull request #4646 from sashashura/patch-4
Fixes Heap-buffer-overflow in Assimp::ObjFileParser::getFace
2022-07-18 15:18:59 +02:00
Kim Kulling
05ececc387 Merge branch 'master' into patch-4 2022-07-18 14:06:29 +02:00
Kim Kulling
316f6e841c Merge pull request #4647 from sashashura/patch-5
Fixes Crash in Assimp::ObjFileMtlImporter::getFloatValue
2022-07-18 14:05:50 +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
sashashura
0c07ea7c71 Fixes Heap-buffer-overflow in SuperFastHash 2022-07-16 13:44:46 +01:00
Kim Kulling
0a9a23a056 Merge pull request #4642 from assimp/kimkulling/fix_stb_header
Fix uninitialized variable.
2022-07-16 14:15:53 +02:00
Kim Kulling
bc6acedb33 Fix uninitialized variable. 2022-07-16 13:57:51 +02:00
Engin Manap
684909a691 Fix comments on PR
1) Use default instead of empty destructor
2) Remove debug code
2022-07-09 17:23:40 +02:00
Engin Manap
3e424f8119 Merge branch 'assimp:master' into master 2022-07-09 17:17:01 +02:00
Koekto-code
d109db152c Use winresrc.h for mingw 2022-07-09 15:32:24 +03:00
Kim Kulling
d8f42279a6 Merge pull request #4630 from tanolino/fix_stl_for_over_4GB
Fix stl for over 4 gb
2022-07-09 10:46:34 +02:00
Kim Kulling
6ad8ea395a Merge branch 'master' into fix_stl_for_over_4GB 2022-07-09 09:58:10 +02:00
Engin Manap
e63426b89c Fix collada parser fails on Mixamo exports 2022-07-08 23:42:41 +02:00
Engin Manap
8a90ba8a39 Don't optimize on debug builds 2022-07-08 23:42:16 +02:00
Kim Kulling
b2d0ac18cf Merge pull request #4631 from robertosfield/master
Build fix for compiling against minizip.
2022-07-08 20:53:40 +02:00
Engin Manap
3890b5dff5 Add missing = operator
implicit assignment operator is depricated, these classes were missing
explicit definitions of this operator.
It is causing warnings, specifically  -Werror=deprecated-copy
2022-07-08 18:16:02 +02:00
Engin Manap
c3a89fd2d0 Fix non virtual destructor use 2022-07-08 18:16:02 +02:00
Engin Manap
ae276987a0 Remove unnecessary const qualifiers
These changes are part of enable -Wall, this specific changes are for
-Werror=ignored-qualifiers
2022-07-08 18:16:02 +02:00
Engin Manap
a10abe0283 Add fallthrough comment to switch case
This allows gcc to identify intentional fallthroughs, which are part all
-Wall. Specifically -Werror=implicit-fallthrough
2022-07-08 18:16:02 +02:00
Robert Osfield
8e062792cd Build fix for compiling against minizip. 2022-07-08 12:46:27 +01:00
Kim Kulling
1c646057ce Merge pull request #4621 from hectorPiteau/patch-1
Fix typo in installation instructions for ubuntu.
2022-07-08 11:43:11 +02:00
Kim Kulling
ee3aaf7446 Merge branch 'master' into patch-1 2022-07-08 11:14:22 +02:00
Kim Kulling
ab4223f671 Merge pull request #4629 from assimp/kimkulling/fix_leak_in_D3MFOpcPackage_issue-4628
Fix memory leak in D3MFOpcPackage
2022-07-08 11:13:41 +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