Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

12783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kimkulling
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
Kim Kulling
22607de237 Merge pull request #3223 from assimp/zyndor-master 
Zyndor master
 2020-05-15 10:51:41 +02:00
kimkulling
a6b5abd698 Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master 2020-05-15 08:51:46 +02:00
Kim Kulling
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
Kim Kulling
2571b47a28 Merge branch 'master' into bug-3177-dae-geo-id 2020-05-13 20:24:53 +02:00
Yingying Wang
e9b67cdb89 gltf2 import sparse accessor 2020-05-11 14:34:35 -07:00
Jeremy Cytryn
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
Jeremy Cytryn
c5a9fbd47f Gracefully handle NaNs and Infs in gltf2 accessor bound computation 2020-05-11 12:02:38 -07:00
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
Kalyan Kumar
b990f703a0 Add IMPORTED_CONFIGURATIONS property to cmake target. 2020-05-07 15:05:40 -07: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
RichardTea
dc8550290e Ensure to delete the scene copy after the test 2020-05-05 10:53:26 +01:00
RichardTea
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
RichardTea
6e447b2c44 Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes 2020-05-05 09:52:08 +01:00
RichardTea
d1ae6ac77a Fix typo in <visual_scene> 
Swapped Id and Name
 2020-05-05 09:51:41 +01:00
RichardTea
700bddb81a Merge branch 'master' into collada_unit_test_cleanup 2020-05-05 09:34:09 +01:00
RichardTea
fa1d2f09db Merge branch 'master' into bug-3177-dae-geo-id 2020-05-05 09:33:48 +01:00
RichardTea
e1decbd532 Merge remote-tracking branch 'upstream/master' 2020-05-05 09:30:44 +01: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
David M. Golembiowski
124e95c477 Merge branch 'master' into master 2020-05-05 01:03:03 -04: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
RichardTea
8e73984a11 Collada Root Nodes aren't allowed to have meshes 
Create a null parent node instead
 2020-05-04 17:47:09 +01:00
kimkulling
5c9a08e375 closes https://github.com/assimp/assimp/issues/3190 : fix leak. 2020-05-04 15:36:54 +02:00
RichardTea
6e200cb0d3 Merge branch 'master' into bug-3177-dae-geo-id 
Impossible merge, have discarded upstream
 2020-05-04 13:59:09 +01:00
RichardTea
ea917bd4ae Move Collada into AssetLib folder 
Should make the merge easier
 2020-05-04 13:54:49 +01:00
RichardTea
5a986090ca Merge branch 'master' into collada_unit_test_cleanup 2020-05-04 13:25:38 +01:00
RichardTea
c6213836aa Merge remote-tracking branch 'upstream/master' 2020-05-04 13:21:52 +01:00
Kim Kulling
c4ea522b6d Merge branch 'master' into master 2020-05-04 10:18:03 +02:00