Commit Graph

12061 Commits (bef66deedaf7cb08b59fa291c64a3b720bd54009)

Author SHA1 Message Date
Kim Kulling 2ee7727d86
Merge branch 'master' into dependabot/github_actions/JesseTG/rm-1.0.3 2022-07-06 08:59:58 +02:00
Kim Kulling 13bee0d5e6
Merge pull request #4614 from assimp/kimkulling/fix_bad_alloc_issue-3417
Fix possible bad_alloc exception for invalid file
2022-07-06 00:10:02 +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
dependabot[bot] b05ff26569
Bump JesseTG/rm from 1.0.2 to 1.0.3
Bumps [JesseTG/rm](https://github.com/JesseTG/rm) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/JesseTG/rm/releases)
- [Commits](https://github.com/JesseTG/rm/compare/v1.0.2...v1.0.3)

---
updated-dependencies:
- dependency-name: JesseTG/rm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-05 20:00:56 +00:00
dependabot[bot] 200e43b99d
Bump actions/cache from 2 to 3
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-05 20:00:53 +00:00
Kim Kulling c1012b4af0
Merge pull request #4569 from turrisxyz/Dependabot-GitHub-Actions
chore: Included githubactions in the dependabot config
2022-07-05 22:00:22 +02:00
Kim Kulling 4a5ad50828
Merge branch 'master' into Dependabot-GitHub-Actions 2022-07-05 20:50:28 +02:00
Kim Kulling f4c8b55b33
Merge pull request #4597 from luca-della-vedova/fix/collada_empty_animation_name
Fix nested animation name being lost in Collada
2022-07-05 20:50:03 +02:00
Kim Kulling 90b75cd6e7
Merge branch 'master' into fix/collada_empty_animation_name 2022-07-05 20:39:19 +02:00
Kim Kulling 50638f98f5
Merge pull request #4609 from assimp/kimkulling/fix-issue-4238
Try to fix issue 4238
2022-07-05 20:36:57 +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 245cd66d11
Merge pull request #4605 from assimp/kimkulling/fix_memleak_in_xmlparser
Fix a memory leak
2022-07-03 08:33:27 +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 43f060663f
Merge pull request #4601 from assimp/kimkulling/fix_mingw_compilation_issue4586
Use mingw.include
2022-06-30 21:46:55 +02:00
Kim Kulling 55625d1af5 Use mingw.include 2022-06-30 20:58:34 +02:00
Kim Kulling be700a0480
Merge pull request #4598 from assimp/kimkulling/fix-win32-build-with-no-dxsdk9-issue4593
Disable build for tools per default
2022-06-29 15:20:41 +02:00
Kim Kulling eee6269cd1
Diable build for tools per default
- closes https://github.com/assimp/assimp/issues/4593
2022-06-29 11:15:29 +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
Kim Kulling e1e8477732
Merge pull request #4596 from assimp/kimkulling/fix_invalid_opengex_token_match
Kimkulling/fix invalid opengex token match
2022-06-28 20:59:37 +02:00
Kim Kulling 96ccaa03a0
Merge branch 'master' into kimkulling/fix_invalid_opengex_token_match 2022-06-28 20:39:54 +02:00
Kim Kulling f76be1a631
Replace debug code by a real test 2022-06-28 20:38:36 +02:00
kimmi 3d692c72ba Fix name of test 2022-06-28 20:31:55 +02:00
kimmi d3c8201614 Fix token match string checks. 2022-06-28 20:31:03 +02:00
Kim Kulling b6f3c8eb15
Merge pull request #4595 from assimp/kimkulling/fix-doc
Update name of package
2022-06-28 18:04:22 +02:00
Kim Kulling 2de95c77a4
Update name of package
- closes https://github.com/assimp/assimp/issues/4594
2022-06-28 17:48:06 +02:00
Kim Kulling 33b672288c
Merge pull request #4542 from hgdagon/master
Fix GNUC check on Windows
2022-06-24 11:02:25 +02:00
Kim Kulling 5598356157
Merge branch 'master' into master 2022-06-24 09:56:09 +02:00
Kim Kulling 6cebe2c1f1
Merge pull request #4581 from Gargaj/w32fix
Fix Windows 32-bit builds
2022-06-24 09:04:47 +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
Kim Kulling 038ae8c028
Merge pull request #4585 from onurtore/otore19/sandbox
Utilizies AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES flag for Collada meshes.
2022-06-23 16:03:02 +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 3f3f4dc6b7
Merge pull request #4534 from tanolino/patch-2
Inifinite loop on bad import files
2022-06-21 14:01:18 +02: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
Kim Kulling ad2a1546eb
Merge pull request #4584 from kovacsv/delete_unused_variable
Remove unused variable.
2022-06-21 13:38:08 +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
Kim Kulling 67fe6643c3
Merge pull request #4578 from PercentBoat4164/master
Add support for GCC v12
2022-06-20 00:03:59 +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 b8812d2b4f
Merge pull request #4552 from assimp/kimkulling/create_skeleton_data_issue_4015
[Experimental] New skeleton container for bones
2022-06-11 21:57:41 +02:00
Kim Kulling 5adea2dbcf
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-06-11 21:40:44 +02:00