Commit Graph

12533 Commits (a4be5aac0bb44b102e8a7806c15d2b0f2e84e8b1)

Author SHA1 Message Date
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
Bengt Rosenberger 76daadb95d
Merge branch 'master' into gltf2_metadata_export 2022-08-10 23:06:41 +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
Kim Kulling 0422dff537
Merge pull request #4668 from Fiskmans/patch-1
Fixed typo
2022-08-03 21:15:59 +02:00
Kim Kulling 2c4f51e863
Merge branch 'master' into patch-1 2022-08-03 14:53:39 +02:00
Kim Kulling 9e0261ea7a
Merge pull request #4669 from assimp/kimkulling/parallel-github-action
Experiment: try to enable parallel build
2022-08-03 14:53:31 +02:00
Bengt Rosenberger abfe8ad413 Added suggested changes and fixed automated check errors 2022-08-01 14:39:10 +02:00
Bengt Rosenberger f20071d740 Merge remote-tracking branch 'origin/gltf2_metadata_export' into gltf2_metadata_export 2022-08-01 14:12:33 +02:00
Bengt Rosenberger da58fbe8fb Got rid of gltf2::ExtrasValue and used gltf2::CustomExtension instead 2022-08-01 14:12:27 +02:00
Bengt Rosenberger cb4d0ab7aa Added missing member copy in gltf2::ExtrasValue ctor. 2022-08-01 14:12:27 +02:00
Bengt Rosenberger 233198baef Fixed extras presence check in gltf2 import. 2022-08-01 14:12:27 +02:00
Bengt Rosenberger 99c3104588 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-08-01 14:12:27 +02:00
Kim Kulling 8c63ed0455
Experiment: try< to enable parallel build 2022-08-01 09:46:08 +02:00
Måns Andersen 0ada8b3b5e
Fixed typo 2022-07-31 22:08:27 +02:00
Kim Kulling dabaa7bdae
Merge pull request #4666 from assimp/kimkulling/waveform_obj_optimizations
Improvements and optimizations for the obj-parsers.
2022-07-31 21:09:44 +02:00
Kim Kulling eac0876c9b Refactoring: Use correct prefix for attributes in ObjImport. 2022-07-31 20:54:58 +02:00
Kim Kulling dddfb74902 Fix another mem-leak 2022-07-31 13:37:42 +02:00
Kim Kulling c349035cd1 Fix face memleak. 2022-07-31 12:10:43 +02:00
Kim Kulling 85f86ec076 Revert using face as pod type 2022-07-30 21:52:33 +02:00