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
e43e3e11b9
Move SharedModifierData definition to BlenderScene.h
2022-08-17 11:42:32 +03:00
2c1943cd10
Improve BlenderDNA error message
2022-08-17 11:42:32 +03:00
a0f375162d
Merge pull request #4453 from Promit/master
...
Added support for more bone weights in GLTF2
2022-08-16 21:20:23 +02:00
89c4640744
Merge branch 'master' into master
2022-08-16 20:53:45 +02:00
d469c7b161
Remove exception on glTF 2.0 loading
2022-08-16 15:52:43 +03:00
0dabe020a9
Merge pull request #4681 from Koekto-code/master
...
Fix problems setting DirectX_LIBRARY
2022-08-15 15:25:41 +02:00
c9fc957535
Merge branch 'master' into master
2022-08-15 15:05:19 +02:00
bd64cc88df
Merge pull request #4678 from villevoutilainen/master
...
Use unqualified uint32_t everywhere in FBXBinaryTokenizer
2022-08-13 08:33:46 +02:00
baf14f6c16
Merge branch 'master' into master
2022-08-12 14:09:04 +02:00
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
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
4b85eb59c2
Fixes Heap-buffer-overflow READ in Assimp::ASE::Parser::ParseLV1SoftSkinBlock
2022-08-10 15:30:07 +01:00
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
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
e419d6898c
Merge branch 'master' into kimkulling/do_not_add_dot_when_extension_is_empty_issue-4670
2022-08-06 18:40:07 +02:00
4aaa807704
Add dot only when the extension is not empty.
2022-08-06 18:37:12 +02:00
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
ec131d0345
Update CMakeLists.txt
2022-08-05 21:47:58 +02:00
1b0682297d
Update to c++17
2022-08-05 21:06:10 +02:00
5084a4d155
Use [[fallthrough]]; to mark whished fallthroughs
...
- closes https://github.com/assimp/assimp/issues/4654
2022-08-05 20:49:37 +02:00
0422dff537
Merge pull request #4668 from Fiskmans/patch-1
...
Fixed typo
2022-08-03 21:15:59 +02:00
2c4f51e863
Merge branch 'master' into patch-1
2022-08-03 14:53:39 +02:00
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
8c63ed0455
Experiment: try< to enable parallel build
2022-08-01 09:46:08 +02:00
0ada8b3b5e
Fixed typo
2022-07-31 22:08:27 +02:00
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
eac0876c9b
Refactoring: Use correct prefix for attributes in ObjImport.
2022-07-31 20:54:58 +02:00
dddfb74902
Fix another mem-leak
2022-07-31 13:37:42 +02:00
c349035cd1
Fix face memleak.
2022-07-31 12:10:43 +02:00
85f86ec076
Revert using face as pod type
2022-07-30 21:52:33 +02:00
0513eff44f
Merge branch 'master' into kimkulling/waveform_obj_optimizations
2022-07-30 13:15:42 +02:00
f6bcb160d0
Improvements of obj-parsers.
2022-07-30 12:58:09 +02:00
75e678a0c5
Merge pull request #4656 from waebbl/update-version-tag
...
Update version tag
2022-07-30 09:31:14 +02:00
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
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
340d800739
Merge branch 'master' into master
2022-07-29 20:42:56 +02:00
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
173fad738f
Merge branch 'master' into Koekto-code-patch-1
2022-07-29 19:54:41 +02:00
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
4f6640278a
Merge branch 'master' into fix/collada_parser_sid
2022-07-29 19:17:43 +02:00
53a4b43ec1
Merge pull request #4643 from sashashura/patch-1
...
Fixes Heap-buffer-overflow in SuperFastHash
2022-07-29 19:15:58 +02:00
b0210cb3cf
Merge branch 'master' into patch-1
2022-07-29 17:48:14 +02:00
7c75a4c59b
Merge branch 'master' into master
2022-07-24 12:31:36 -07:00
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
73542f3830
Merge branch 'master' into patch-2
2022-07-24 12:11:18 +02:00
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
f07bc2c5b9
Merge branch 'master' into patch-3
2022-07-18 15:19:27 +02:00
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
05ececc387
Merge branch 'master' into patch-4
2022-07-18 14:06:29 +02:00
Turo Lamminen
Kim Kulling
vkaytsanov
Koekto-code
Aleks L
Ville Voutilainen
Kim Kulling
Måns Andersen
Bernd Waibel
Engin Manap