e2ccd17494
Fix typo
2021-11-12 11:20:22 +01:00
157e032bde
Fix small findings
...
- Merge anonymous functions into one block.
- Some reformattings
2021-11-12 11:08:19 +01:00
37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-12 10:37:19 +01:00
2e5e176bf3
Merge pull request #4147 from alpire/master
...
Fix out-of-bounds read in RemoveLineComments
2021-11-12 10:36:44 +01:00
c22524351a
Merge branch 'master' into master
2021-11-12 09:56:56 +01:00
97b8e41997
Fix formatting
2021-11-12 09:56:45 +01:00
a7a6b96ca8
Merge pull request #4150 from kovacsv/readme_add_assimpjs
...
Add assimpjs link to the ports in the readme file
2021-11-12 09:31:39 +01:00
6f853be88c
Merge branch 'master' into readme_add_assimpjs
2021-11-12 09:18:22 +01:00
b43a84a496
Merge pull request #4159 from RichardTea/3ds_export_4157
...
3DS Export: Add support for aiShadingMode_PBR_BRDF
2021-11-12 09:17:49 +01:00
ece61c6c68
Update M3DWrapper.cpp
2021-11-12 09:17:32 +01:00
608bccd9cf
Update M3DWrapper.h
2021-11-12 09:13:48 +01:00
13731b37c4
Merge branch 'master' into 3ds_export_4157
2021-11-12 07:06:52 +01:00
4abf37ace6
Update CMakeLists.txt
2021-11-11 23:22:06 +01:00
4854978108
Disable m3d for 5.1
...
- closes https://github.com/assimp/assimp/issues/4126
2021-11-11 22:15:56 +01:00
1f8edd5959
Merge pull request #4160 from RichardTea/fix_gltf_warning_4126
...
Check and limit maximum size of glTF
2021-11-11 21:30:07 +01:00
43b0ef181a
Merge branch 'master' into fix_gltf_warning_4126
2021-11-11 20:30:07 +01:00
add7f1355e
Merge pull request #4163 from RichardTea/fix_aiMesh_abi_4162
...
Better aiMesh ABI compatibility with 5.0.1, make smaller
2021-11-11 20:27:40 +01:00
7120504c46
Merge branch 'master' into fix_aiMesh_abi_4162
2021-11-11 20:02:46 +01:00
8a1563d61a
Merge pull request #4170 from assimp/Artenuvielle-x3d_pugi_migration_artenuvielle
...
Artenuvielle x3d pugi migration artenuvielle
2021-11-11 19:19:33 +01:00
eafb79e7dc
Merge branch 'Artenuvielle-x3d_pugi_migration_artenuvielle' of https://github.com/assimp/assimp into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-11 19:06:33 +01:00
952f0a53c9
Try to fix a leak
2021-11-11 19:06:25 +01:00
b6994c5e1f
Merge branch 'master' into readme_add_assimpjs
2021-11-11 07:38:42 +01:00
9f28ef4c25
Merge branch 'master' into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-10 20:43:39 +01:00
a31c979abc
Use helloworld as X3D-Testcase
2021-11-10 20:40:05 +01:00
8ed18621db
Fixes
2021-11-10 20:37:27 +01:00
fe511fddc4
Merge pull request #4165 from irajsb/master
...
Added UE4 plugin
2021-11-10 11:06:22 +01:00
39664d608d
Merge branch 'master' into master
2021-11-10 10:51:18 +01:00
baf3f00644
Merge branch 'master' into master
2021-11-10 10:37:49 +01:00
d4755648b4
Merge pull request #4167 from assimp/kimkulling-fix_uninitialized_attribs_issue-4158
...
Update anim.h
2021-11-10 09:34:52 +01:00
5fd2a5559c
Update mesh.h
...
- Add initialization for armature attributes.
- closes https://github.com/assimp/assimp/issues/4158
2021-11-10 09:19:29 +01:00
c01d33a77a
Update anim.h
...
- Add missing whitespaces
2021-11-10 09:12:35 +01:00
83950845ee
Merge pull request #4166 from assimp/kimkulling-fix_version_issue-4161
...
Change version to 5.1.0
2021-11-10 09:08:23 +01:00
8a613a8655
Fix unittest
2021-11-09 23:27:58 +01:00
e206d699da
Change version to 5.1.0
...
- Change version for Version 5.1.0-RC1 to 5.1.0
- closes https://github.com/assimp/assimp/issues/4161
2021-11-09 23:26:20 +01:00
7ddd9b2484
Added UE4 plugin
2021-11-10 00:04:12 +03:30
50ba15191b
Merge pull request #4164 from Skylion007/update-performance-fixes
...
Remove optimization fence preventing automatic move
2021-11-09 20:09:31 +01:00
b8a10e62f9
Remove optimization fence
2021-11-09 13:08:13 -05:00
86a25b62e4
Better aiMesh ABI compatibility with 5.0.1, make smaller
...
Move new mTextureCoordsNames member to end of struct
Convert to pointer-to-array, saving ~8KB per aiMesh in almost all cases
Add C++ accessor functions for simpler usage
2021-11-09 13:03:06 +00:00
30143e9626
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-09 10:53:58 +01:00
aaae3e3a10
size_t is 32bit on some platforms
...
Also assert if size_t is smaller than uint32_t (probably not necessary)
Note: 32bit builds will crash OOM if a really large model is loaded, as cannot allocate that much in total, let alone contiguously.
2021-11-08 15:05:20 +00:00
9433fc526a
Apply clangformat
2021-11-08 14:42:21 +00:00
69cafe64b4
Cap glTFv1 & 2 json size to ~4GB
...
Ensures size_t cannot overflow
Limits the maximum contiguous memory allocation to something plausible.
2021-11-08 14:41:13 +00:00
ee19ce6021
3DS Export: Add support for aiShadingMode_PBR_BRDF
...
Export as Phong.
If no Diffuse texture, export the PBR base color instead,
2021-11-08 11:06:15 +00:00
cedf1819c3
Do not build ziplib when 3MF exporter is disabled.
2021-11-04 01:14:24 -07:00
2b4b3e820b
Merge pull request #4154 from assimp/kimkulling-fuzzer-issue-4153
...
Update D3MFOpcPackage.cpp
2021-11-02 10:51:58 +01:00
5a3401b69f
Update D3MFOpcPackage.cpp
...
- Log an error in case of a nullptr-exception in reading out the 3MF-Archive
- closes https://github.com/assimp/assimp/issues/4153
2021-11-02 10:38:38 +01:00
3b2a9d1543
Add assimpjs link.
2021-11-01 08:09:16 +01:00
145f972d76
Fix out-of-bounds read in RemoveLineComments
...
Follow up to 6f07e89fdfhttps://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24553
2021-10-30 13:43:41 -04:00
3664fe20c0
Merge pull request #4146 from alpire/master
...
Fix fuzzer crashes
2021-10-29 20:20:04 +02:00
322de54323
Merge branch 'master' into master
2021-10-29 19:35:27 +02:00
Kim Kulling
Kim Kulling
Viktor Kovacs
iraj mohtasham
Aaron Gokaslan
RichardTea
Jeremie Dumas
Alex Rebert