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

11298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bengt Rosenberger
2b804c638f Merge branch 'master' into gltf2_metadata_export 2022-07-25 21:48:46 +02: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
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
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
Kim Kulling
b2d0ac18cf Merge pull request #4631 from robertosfield/master 
Build fix for compiling against minizip.
 2022-07-08 20:53:40 +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
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
a1f9a299e9 Merge pull request #4627 from assimp/kimkulling/remove_assert_from_parser_issue-4626 
Remove assertion test
 2022-07-08 10:11:44 +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
Hector Piteau
e77ab52dba Merge branch 'master' into patch-1 2022-07-08 14:56:21 +09:00
Kim Kulling
7e4a20f843 Merge pull request #4541 from blackhorse-reddog/master 
I ran into an error while processing coloured binary stl. Just a type but better be fixed
 2022-07-07 14:37:24 +02:00
Kim Kulling
e9b08f35b2 Merge branch 'master' into master 2022-07-07 13:21:08 +02:00
Kim Kulling
bac3432733 Merge pull request #4611 from assimp/dependabot/github_actions/actions/checkout-3 
Bump actions/checkout from 2 to 3
 2022-07-07 11:10:49 +02:00
Hector Piteau
579bd6b13e Fix typo in installation instructions for ubuntu. 2022-07-07 17:11:58 +09:00
Kim Kulling
e3c94c6412 Merge branch 'master' into dependabot/github_actions/actions/checkout-3 2022-07-07 09:26:05 +02:00
Kim Kulling
3ae1a37a41 Merge pull request #4610 from assimp/dependabot/github_actions/actions/upload-artifact-3 
Bump actions/upload-artifact from 2 to 3
 2022-07-07 09:25:51 +02:00
Kim Kulling
8d5ed5dfe5 Merge branch 'master' into dependabot/github_actions/actions/upload-artifact-3 2022-07-07 09:09:51 +02:00
Kim Kulling
395b9f535e Merge pull request #4619 from assimp/kimkulling/fix_texture_loading_3mp_issue-4568 
Kimkulling/fix texture loading 3MF, reladed issue-4568
 2022-07-06 21:21:55 +02:00
Kim Kulling
77a2cdee76 Fix texture fetch for embedded textures in 3mf-files. 2022-07-06 20:59:42 +02:00
Kim Kulling
0db8b3daae Use default destructor. 2022-07-06 20:59:17 +02:00
dependabot[bot]
9a3bde0e6d Bump actions/upload-artifact from 2 to 3 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-06 11:41:23 +00:00
Kim Kulling
422ed5279a Merge branch 'master' into dependabot/github_actions/actions/checkout-3 2022-07-06 13:40:51 +02:00
Kim Kulling
44fad544e6 Merge pull request #4612 from assimp/dependabot/github_actions/actions/cache-3 
Bump actions/cache from 2 to 3
 2022-07-06 13:40:40 +02:00
dependabot[bot]
15030fb7b1 Bump actions/checkout from 2 to 3 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-06 07:37:31 +00:00
Kim Kulling
744ed2256b Merge branch 'master' into dependabot/github_actions/actions/cache-3 2022-07-06 09:37:07 +02:00
Kim Kulling
ec2db278e3 Merge pull request #4613 from assimp/dependabot/github_actions/JesseTG/rm-1.0.3 
Bump JesseTG/rm from 1.0.2 to 1.0.3
 2022-07-06 09:36:49 +02:00
Kim Kulling
2ee7727d86 Merge branch 'master' into dependabot/github_actions/JesseTG/rm-1.0.3 2022-07-06 08:59:58 +02:00