Commit Graph

11380 Commits (46e571e4974a8635561c9296d87f1a55575d0647)

Author SHA1 Message Date
Kim Kulling 46e571e497
Merge pull request #4700 from Skylion007/skylion007/modernize-use-emplace
Apply modernize-use-emplace clang-tidy rule
2022-08-25 10:50:11 +02:00
Kim Kulling 2b30b7e062
Merge branch 'master' into skylion007/modernize-use-emplace 2022-08-24 11:48:30 +02:00
Kim Kulling 066f3f5f14
Merge pull request #4701 from turol/x3d-fixes
Fix out of bounds reads in X3D importer
2022-08-24 11:44:50 +02:00
Kim Kulling 659195d852
Fix the fixme
- Based on the implementation in top of the last one I guess I know how to fix that.
- Replacing push_back by emplace_back
2022-08-24 11:17:10 +02:00
Turo Lamminen 0d8723a3eb Add FIXME comment 2022-08-24 10:43:40 +03:00
Turo Lamminen 654ae3af4e Fix out of bounds access in X3D loader 2022-08-24 10:42:01 +03:00
Kim Kulling 88c69d4edc
Merge pull request #4693 from vkaytsanov/master
Remove exception on glTF 2.0 loading
2022-08-23 23:36:26 +02:00
Aaron Gokaslan 25add7baa2
Merge branch 'master' into skylion007/modernize-use-emplace 2022-08-23 15:14:48 -04:00
Kim Kulling 87f601531c
Merge branch 'master' into master 2022-08-23 21:14:45 +02:00
Kim Kulling aa521569f7
Merge pull request #4699 from turol/smd-fixes
SMD fixes
2022-08-23 21:08:42 +02:00
Aaron Gokaslan b176061c41 Remove extra space in emplace insertions 2022-08-23 11:46:30 -04:00
Aaron Gokaslan 27edb43600 Apply modernize-use-emplace clang-tidy rule 2022-08-23 11:41:49 -04:00
Turo Lamminen f890bc791f Fix out of bounds write 2022-08-23 14:38:27 +03:00
Turo Lamminen 68bc6a06b9 Use unique_ptr for aaiBones instead of explicit delete[] 2022-08-23 14:17:56 +03:00
Turo Lamminen 03397d42e2 Use unique_ptr for aaiFaces instead of explicit delete[] 2022-08-23 14:15:06 +03:00
Turo Lamminen 795c0abcc8 Apply modernize-loop-convert to the simplified loop 2022-08-23 14:10:23 +03:00
Turo Lamminen 1ca44acebc Simplify a for loop 2022-08-23 14:10:23 +03:00
Turo Lamminen 712671e81a Apply modernize-loop-convert again 2022-08-23 14:10:20 +03:00
Turo Lamminen 5f28c51c03 Apply clang-tidy modernize-loop-convert transformation 2022-08-23 13:59:42 +03:00
Kim Kulling 04997ccbf3
Merge pull request #4697 from assimp/kimkulling/patch-issue-4676
[WIP] Use ai_Real to write correct accuracy
2022-08-18 19:04:28 +02:00
Kim Kulling 2013ae114a
[WIP] Use ai_Real to write correct accuracy
- closes https://github.com/assimp/assimp/issues/4676
2022-08-18 17:41:07 +02:00
Turo Lamminen 94c3ec57af
Merge pull request #4679 from turol/blender-fixes
(Mostly) Blender fixes
2022-08-18 15:49:16 +03:00
vkaytsanov 4c143eb581
Merge branch 'master' into master 2022-08-17 12:01:44 +03:00
Turo Lamminen 1c59de42fc Make some blender fields warn if missing instead of error 2022-08-17 11:42:32 +03:00
Turo Lamminen d2dc0401c3 Use weak pointer for ModifierData prev to avoid memory leak 2022-08-17 11:42:32 +03:00
Turo Lamminen 30555282fe Use weak pointer for ElemBase last to avoid memory leak 2022-08-17 11:42:32 +03:00
Turo Lamminen 219dbbd4af Fix crash of "assimp info" with no parameters 2022-08-17 11:42:32 +03:00
Turo Lamminen 56b6446913 Use weak pointer for MirrorModifierData mirror_ob to avoid memory leak 2022-08-17 11:42:32 +03:00
Turo Lamminen 90d1464405 Remove set but unused variables 2022-08-17 11:42:32 +03:00
Turo Lamminen 2e64880abf Inherit SubsurfModifierData and MirrorModifierData from SharedModifierData
This makes the cast in BlenderModifierShowcase::ApplyModifiers work
correctly and not invoke UB.
2022-08-17 11:42:32 +03:00
Turo Lamminen e43e3e11b9 Move SharedModifierData definition to BlenderScene.h 2022-08-17 11:42:32 +03:00
Turo Lamminen 2c1943cd10 Improve BlenderDNA error message 2022-08-17 11:42:32 +03:00
Kim Kulling a0f375162d
Merge pull request #4453 from Promit/master
Added support for more bone weights in GLTF2
2022-08-16 21:20:23 +02:00
Kim Kulling 89c4640744
Merge branch 'master' into master 2022-08-16 20:53:45 +02:00
vkaytsanov d469c7b161 Remove exception on glTF 2.0 loading 2022-08-16 15:52:43 +03:00
Kim Kulling 0dabe020a9
Merge pull request #4681 from Koekto-code/master
Fix problems setting DirectX_LIBRARY
2022-08-15 15:25:41 +02:00
Kim Kulling c9fc957535
Merge branch 'master' into master 2022-08-15 15:05:19 +02:00
Kim Kulling bd64cc88df
Merge pull request #4678 from villevoutilainen/master
Use unqualified uint32_t everywhere in FBXBinaryTokenizer
2022-08-13 08:33:46 +02:00
Kim Kulling baf14f6c16
Merge branch 'master' into master 2022-08-12 14:09:04 +02:00
Koekto-code 0e4ba1fdd1
Fix problems setting DirectX_LIBRARY
DirectX_LIBRARY was always clearing, though DirectX_PREFIX_PATH was not changed. This is because I had some semicolons at begin of DirectX_PREFIX_PATH and the macro `clear_if_changed` discarded them. Now it saves all extra semicolons and check passes.
2022-08-11 22:10:16 +03:00
Kim Kulling 888468e8f7
Merge pull request #4680 from sashashura/patch-6
Fixes Heap-buffer-overflow READ in Assimp::ASE::Parser::ParseLV1SoftSkinBlock
2022-08-11 11:47:48 +02:00
Aleks L 4b85eb59c2
Fixes Heap-buffer-overflow READ in Assimp::ASE::Parser::ParseLV1SoftSkinBlock 2022-08-10 15:30:07 +01:00
Ville Voutilainen 253f8bfa62 Use unqualified uint32_t everywhere in FBXBinaryTokenizer
The use of qualified std::uint32_t requires including <cstdint> instead
of <stdint.h> on some implementations, and that breaks the build of Qt 6
on GCC 13. Just use the unqualified name everywhere.
2022-08-09 01:54:31 +03:00
Kim Kulling 17c6491c91
Merge pull request #4674 from assimp/kimkulling/do_not_add_dot_when_extension_is_empty_issue-4670
Kimkulling/do not add dot when extension is empty issue 4670
2022-08-06 21:22:54 +02:00
Kim Kulling e419d6898c Merge branch 'master' into kimkulling/do_not_add_dot_when_extension_is_empty_issue-4670 2022-08-06 18:40:07 +02:00
Kim Kulling 4aaa807704 Add dot only when the extension is not empty. 2022-08-06 18:37:12 +02:00
Kim Kulling b3b064eb69
Merge pull request #4673 from assimp/kimkulling/introduce-fallthroughs_issue-4654
Use  [[fallthrough]]; to mark whished fallthroughs
2022-08-06 09:07:30 +02:00
Kim Kulling ec131d0345
Update CMakeLists.txt 2022-08-05 21:47:58 +02:00
Kim Kulling 1b0682297d
Update to c++17 2022-08-05 21:06:10 +02:00
Kim Kulling 5084a4d155
Use [[fallthrough]]; to mark whished fallthroughs
- closes https://github.com/assimp/assimp/issues/4654
2022-08-05 20:49:37 +02:00