Commit Graph

8734 Commits

Author SHA1 Message Date
Jeremy Cytryn
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
Kim Kulling
578dc09810 Merge pull request #3175 from hoshiryu/fix_fbx_rotation
Fix fbx rotation ;
2020-05-11 19:19:40 +02:00
hoshiryu
3fdcd0861f Fix fbx rotation ; 2020-05-11 10:28:05 +02:00
Kim Kulling
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
Kim Kulling
ea26cba420 Merge branch 'master' into ps-devel-fix-contrib-zlib-static-compile-001 2020-05-09 11:10:33 +02:00
Kim Kulling
4c654d3211 Merge pull request #3211 from assimp/add_fuzzer_target
integrate first fuzzer target.
2020-05-07 15:23:38 +02:00
Kim Kulling
40e99113cb Fix findings
- rename file to cpp
- use no hint
2020-05-07 15:03:35 +02:00
Kim Kulling
906720ee93 Merge branch 'master' into add_fuzzer_target 2020-05-07 14:59:55 +02:00
Kim Kulling
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
kimkulling
a1bcca2c99 remove step prototype: does not work this way. 2020-05-07 14:00:40 +02:00
kimkulling
927488ee5d integrate first fuzzer target. 2020-05-07 13:59:18 +02:00
Kim Kulling
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
Kim Kulling
89a865ce19 Merge branch 'master' into master 2020-05-06 22:07:39 +02:00
Kim Kulling
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
Sercan Degirmenci
201347700f fix incorrect header path on framework build 2020-05-06 16:15:23 +03:00
Kim Kulling
d8bb6e446a Merge pull request #3208 from assimp/issue_3186
Remove duplicate flag
2020-05-06 13:56:10 +02:00
Kim Kulling
4c75857f50 Remove duplicate flag 2020-05-06 13:46:26 +02:00
Kim Kulling
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
60e8146b9f fix wrong target idx when importing 2020-05-05 12:51:40 -07:00
Kim Kulling
cacc7c1b27 Merge pull request #3204 from assimp/aaronfranke-file-formatting
Aaronfranke file formatting
2020-05-05 17:09:55 +02:00
Kim Kulling
ddee1b1ddb Merge branch 'master' into aaronfranke-file-formatting 2020-05-05 10:21:46 +02:00
kkulling
4e16716924 Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting 2020-05-05 10:17:52 +02:00
Kim Kulling
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
Kim Kulling
bf95d1da7c fix conversion 2020-05-04 21:48:46 +02:00
Kim Kulling
6afb72216c Compile constructor of aiMetadataType only for c++ 2020-05-04 20:50:44 +02:00
Kim Kulling
3b4a9812e5 add init list for metadatatype. 2020-05-04 20:40:08 +02:00
kimkulling
5c9a08e375 closes https://github.com/assimp/assimp/issues/3190 : fix leak. 2020-05-04 15:36:54 +02:00
Kim Kulling
8675bb0912 Merge pull request #3197 from assimp/kimkulling_dev
Kimkulling dev
2020-05-03 18:58:49 +02:00
Kim Kulling
918d3d4206 fix invalid endif statement in cmake. 2020-05-03 15:55:42 +02:00
Kim Kulling
91fa9a102b closes https://github.com/assimp/assimp/issues/3181: fix typo for light type. 2020-05-03 12:17:32 +02:00
Kim Kulling
09dcb76063 Merge branch 'master' into kimkulling_dev 2020-05-03 11:50:18 +02:00
Kim Kulling
3b06f57150 add missing inclde + 2020-05-02 21:11:47 +02:00
Kim Kulling
4f902faddf build: move option for viewer to the other options. 2020-05-02 21:08:24 +02:00
Kim Kulling
514593548d add assert-test for nullptr. 2020-05-02 21:07:41 +02:00
Kim Kulling
3329e76263 closes https://github.com/assimp/assimp/issues/3178: throw exception in case of invalid export stream. 2020-05-02 21:06:55 +02:00
Kim Kulling
a874facbbf Merge pull request #3196 from assimp/kimkulling_dev
Kimkulling dev
2020-05-02 19:55:33 +02:00
Kim Kulling
f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02:00
Kim Kulling
52122a9900 Merge branch 'master' into kimkulling_dev 2020-05-01 10:49:03 +02:00
Kim Kulling
08609feb54 Merge pull request #3170 from assimp/opencollective-opencollective
Opencollective opencollective
2020-04-30 21:32:42 +02:00
Kim Kulling
1505a57ad2 Merge branch 'master' into opencollective-opencollective 2020-04-30 21:05:50 +02:00
Kim Kulling
b495c42a33 Merge pull request #3171 from assimp/kimkulling-patch-github-actions
Add sanitizer support
2020-04-30 21:04:08 +02:00
Kim Kulling
a639221ede Update to float
- Temporary change to analyze leak.
2020-04-30 09:14:42 +02:00
Kim Kulling
6956ef53d9 Merge branch 'master' into opencollective-opencollective 2020-04-30 09:08:55 +02:00
Kim Kulling
2d9d112015 fix warning 2020-04-29 21:35:42 +02:00
Kim Kulling
1c30b7bf8e tryout: check if leak is coupled to type double. 2020-04-29 21:31:01 +02:00
Kim Kulling
e0bc0f7fad try to fix double memleak. 2020-04-29 21:19:15 +02:00
Kim Kulling
da2bf5c7a4 fix wrong size 2020-04-29 21:13:46 +02:00
Kim Kulling
f808ed9fb5 fbxconverter: fix memoryleak. 2020-04-29 20:52:49 +02:00
Kim Kulling
c6131ce38a scenecombiner: fix leak. 2020-04-29 20:43:23 +02:00
Kim Kulling
fd555a1349 review findings. 2020-04-29 20:33:37 +02:00