e39c632809
cleanup
2020-05-18 11:50:51 -07:00
a87df0eb32
merge
2020-05-18 11:35:46 -07:00
0897c4c7be
merge
2020-05-18 11:31:44 -07:00
02cbd36271
pull master
2020-05-18 11:15:18 -07:00
3b15eca099
Merge pull request #3226 from M4T1A5/gltf2_fix_skin_recursion
...
[GLTF2] Fix infinite recursion in skin/node parsing
2020-05-18 11:12:49 +02:00
2438e1b52e
Merge branch 'master' into gltf2_fix_skin_recursion
2020-05-18 09:05:28 +02:00
af3033ee8b
Merge branch 'master' into gltf2_sparseAccessor_import
2020-05-17 17:21:55 +02:00
110f8845a2
Merge pull request #3215 from kalyan-kumar/unix-cmake-fix
...
Add IMPORTED_CONFIGURATIONS property to cmake target.
2020-05-17 16:21:42 +02:00
1259146daa
Merge branch 'master' into unix-cmake-fix
2020-05-17 14:14:12 +02:00
0fc82388f9
Merge pull request #3214 from jercytryn/master
...
[gltf2 Export] More robust handling for non-finites and 0-length normals
2020-05-17 14:12:48 +02:00
4b0a3305b1
Merge branch 'master' into master
2020-05-17 13:54:10 +02:00
9566284873
Merge pull request #3229 from assimp/qarmin-added_check_before_using
...
Qarmin added check before using
2020-05-17 13:53:44 +02:00
4f24b3dac2
Merge branch 'added_check_before_using' of https://github.com/qarmin/assimp into qarmin-added_check_before_using
2020-05-17 11:48:24 +02:00
15125c5eb8
Merge pull request #3205 from RichardTea/bug-3201-collada_root_meshes
...
Export Collada Meshes on root aiNode
2020-05-17 11:39:02 +02:00
cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes
2020-05-16 20:50:34 +02:00
883f18ebe5
Merge pull request #3195 from dmgolembiowski/master
...
Any interest in Rust '18 port?
2020-05-16 20:49:55 +02:00
d7e8fefed7
Merge branch 'master' into master
2020-05-16 20:41:05 +02:00
7fe5257e0f
Merge pull request #3194 from RichardTea/collada_unit_test_cleanup
...
Collada unit test cleanup
2020-05-16 20:40:28 +02:00
df9c09d9e1
Merge branch 'master' into collada_unit_test_cleanup
2020-05-16 19:59:30 +02: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
Yingying Wang
Kim Kulling
Kim Kulling
Matias Kangasjärvelä
Jeremy Cytryn
hoshiryu
Kalyan Kumar
Sercan Degirmenci