2ffd1cb8db
nits
2020-05-15 17:22:15 +01:00
bcca3a0d79
No need for bespoke macros
2020-05-15 17:22:02 +01:00
6be0ce1ec9
Initial pass at adding logging
2020-05-15 17:21:45 +01:00
7a16a7a7e4
Fix infinite recursion in gltf2 skin parsing
...
Previously parsing a node caused the skin that was attached to it
to be parsed, which caused the skins node joints to be parsed,
which could cause the skin to be re-parsed leading to infinite or
at the very least exponential recursion.
The fix is to just get a reference to a temporarily uninitialized
skin as they were being parsed after the scene graph just to be safe
anyway. This way we avoid the recursion problem and all the references
will be valid in the end.
2020-05-15 16:48:41 +03:00
b7de061749
Merge pull request #3225 from assimp/inhosens-master
...
Inhosens master
2020-05-15 15:16:47 +02:00
464d4cf99a
Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master
2020-05-15 15:08:30 +02:00
e74d86b40e
Merge pull request #3224 from assimp/migenius-migenius-fix-ortho
...
Migenius migenius fix ortho
2020-05-15 14:09:42 +02:00
246ec2b0dc
Merge branch 'migenius-fix-ortho' of https://github.com/migenius/assimp into migenius-migenius-fix-ortho
2020-05-15 13:37:03 +02:00
22607de237
Merge pull request #3223 from assimp/zyndor-master
...
Zyndor master
2020-05-15 10:51:41 +02:00
a6b5abd698
Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master
2020-05-15 08:51:46 +02:00
c32f587a89
Merge pull request #3188 from RichardTea/bug-3177-dae-geo-id
...
Collada: Ensure export uses unique Mesh Ids
2020-05-13 20:39:14 +02:00
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
e9b67cdb89
gltf2 import sparse accessor
2020-05-11 14:34:35 -07:00
c3a21666da
Make gltf2 export normal normalization safe
...
This avoids introducing NaNs e.g. when the input mesh has 0-length normals
2020-05-11 12:02:38 -07:00
c5a9fbd47f
Gracefully handle NaNs and Infs in gltf2 accessor bound computation
2020-05-11 12:02:38 -07:00
aef4ecada5
Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated
...
This can happen currently for example if NaNs are introduced in accessor bounds as rapidjson cannot write NaN/inf floats (see subsequent commit for fix there) and will halt writing to buffer at this point. Fix here ensures that whenever anything like this happens we throw an exception so this ends up as a registered export failure case, rather than silently exporting the incomplete JSON
2020-05-11 12:02:38 -07:00
578dc09810
Merge pull request #3175 from hoshiryu/fix_fbx_rotation
...
Fix fbx rotation ;
2020-05-11 19:19:40 +02:00
3fdcd0861f
Fix fbx rotation ;
2020-05-11 10:28:05 +02:00
60256b8c1c
Merge pull request #3146 from pseiderer/ps-devel-fix-contrib-zlib-static-compile-001
...
contrib/zlib: disable dynamic library building
2020-05-09 12:20:56 +02:00
ea26cba420
Merge branch 'master' into ps-devel-fix-contrib-zlib-static-compile-001
2020-05-09 11:10:33 +02:00
b990f703a0
Add IMPORTED_CONFIGURATIONS property to cmake target.
2020-05-07 15:05:40 -07:00
4c654d3211
Merge pull request #3211 from assimp/add_fuzzer_target
...
integrate first fuzzer target.
2020-05-07 15:23:38 +02:00
40e99113cb
Fix findings
...
- rename file to cpp
- use no hint
2020-05-07 15:03:35 +02:00
906720ee93
Merge branch 'master' into add_fuzzer_target
2020-05-07 14:59:55 +02:00
0af541e7cd
Merge pull request #3212 from assimp/remove_step_prototype
...
remove step prototype: does not work this way.
2020-05-07 14:59:36 +02:00
a1bcca2c99
remove step prototype: does not work this way.
2020-05-07 14:00:40 +02:00
927488ee5d
integrate first fuzzer target.
2020-05-07 13:59:18 +02:00
9f03397f32
Merge pull request #3105 from rudybear/master
...
Fixed bone splitting with excessive amount of bones with 0 weight
2020-05-07 00:25:13 +02:00
89a865ce19
Merge branch 'master' into master
2020-05-06 22:07:39 +02:00
8d41af09bc
Merge pull request #3209 from sercand/fix-macos-framework
...
fix incorrect header path on framework build
2020-05-06 15:50:52 +02:00
201347700f
fix incorrect header path on framework build
2020-05-06 16:15:23 +03:00
d8bb6e446a
Merge pull request #3208 from assimp/issue_3186
...
Remove duplicate flag
2020-05-06 13:56:10 +02:00
4c75857f50
Remove duplicate flag
2020-05-06 13:46:26 +02:00
519b5871e3
Merge pull request #3207 from thomasbiang/gltf2_blendshapeImportMissing
...
Fix for issue# 3206: GLTF2 blendshape import missing shapes https://github.com/assimp/assimp/issues/3206
2020-05-06 13:34:30 +02:00
60e8146b9f
fix wrong target idx when importing
2020-05-05 12:51:40 -07:00
cacc7c1b27
Merge pull request #3204 from assimp/aaronfranke-file-formatting
...
Aaronfranke file formatting
2020-05-05 17:09:55 +02:00
dc8550290e
Ensure to delete the scene copy after the test
2020-05-05 10:53:26 +01:00
56a4e61533
Collada: Don't copy the scene when exporting
...
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
2020-05-05 10:16:13 +01:00
6e447b2c44
Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes
2020-05-05 09:52:08 +01:00
d1ae6ac77a
Fix typo in <visual_scene>
...
Swapped Id and Name
2020-05-05 09:51:41 +01:00
700bddb81a
Merge branch 'master' into collada_unit_test_cleanup
2020-05-05 09:34:09 +01:00
fa1d2f09db
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-05 09:33:48 +01:00
ddee1b1ddb
Merge branch 'master' into aaronfranke-file-formatting
2020-05-05 10:21:46 +02:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
124e95c477
Merge branch 'master' into master
2020-05-05 01:03:03 -04:00
3a84675c2b
Merge pull request #3202 from assimp/issue_3190
...
closes https://github.com/assimp/assimp/issues/3190 : fix leak.
2020-05-04 22:16:25 +02:00
bf95d1da7c
fix conversion
2020-05-04 21:48:46 +02:00
6afb72216c
Compile constructor of aiMetadataType only for c++
2020-05-04 20:50:44 +02:00
3b4a9812e5
add init list for metadatatype.
2020-05-04 20:40:08 +02:00
8e73984a11
Collada Root Nodes aren't allowed to have meshes
...
Create a null parent node instead
2020-05-04 17:47:09 +01:00
Malcolm Tyrrell
Matias Kangasjärvelä
Kim Kulling
kimkulling
Yingying Wang
Jeremy Cytryn
hoshiryu
Kalyan Kumar
Sercan Degirmenci
RichardTea
kkulling
David M. Golembiowski