Commit Graph

9903 Commits (bef2304c5357a0ed761b98e7d5ae725fdf8f2591)

Author SHA1 Message Date
Kim Kulling bef2304c53
Update repo for assimp-net 2021-04-14 08:55:55 +02:00
Kim Kulling 182418e818
Merge pull request #3755 from assimp/kimkulling-issue3754
Not resize empty vectors.
2021-04-12 23:31:06 +02:00
Kim Kulling a6e4672df1
Fix a typo. 2021-04-12 23:19:00 +02:00
Kim Kulling d1eeb80e1a
Not resize empty vectors.
closes https://github.com/assimp/assimp/issues/3754
2021-04-12 21:05:46 +02:00
Kim Kulling c9ba616eb6
Merge pull request #3708 from urschanselmann/master
Fix import of FBX files with last UV duplicated (caused by bug in FBX SDK 2019.0+)
2021-04-12 11:50:12 +02:00
Kim Kulling 263d450300
Merge branch 'master' into master 2021-04-12 09:35:03 +02:00
Kim Kulling 67fa0a13bc
Merge pull request #3749 from pcwalton/ms3d-fixes
Fix incorrect indices in the MilkShape 3D loader
2021-04-11 20:37:31 +02:00
Kim Kulling a3ee377af7
Merge branch 'master' into ms3d-fixes 2021-04-11 19:12:06 +02:00
Kim Kulling cf4ef04a80
Merge branch 'master' into master 2021-04-07 20:58:40 +02:00
Kim Kulling 6eae925441
Merge pull request #3695 from AllegorithmicSAS/feature/gltf_fb_ngon_encoding
[gltf2-exporter] Adding FB_ngon_encoding support
2021-04-07 20:52:05 +02:00
Clement JACOB e66232d8c3
Merge branch 'master' into feature/gltf_fb_ngon_encoding 2021-04-07 13:54:31 +02:00
Patrick Walton a44ba41413 Fix incorrect indices in the MilkShape 3D loader 2021-04-05 19:14:48 -07:00
Kim Kulling d51fce9e70
Merge pull request #3748 from assimp/kimkulling-issue_3747
Fix direct leak
2021-04-05 21:37:48 +02:00
Kim Kulling 7fee914776
Fix direct leak
closes https://github.com/assimp/assimp/issues/3747
2021-04-05 21:24:54 +02:00
Kim Kulling 4eb69d1e54
Merge pull request #3746 from BaldricS/rename_PI_to_avoid_macro_convention
Renaming PI to aiPi.
2021-04-05 18:40:27 +02:00
Scott Baldric 31e8042071 Renaming PI to aiPi. 2021-04-05 09:59:22 -05:00
Kim Kulling 06a60c43cf
Merge pull request #3739 from assimp/kimkulling-patch-7
Update INSTALL
2021-04-04 20:46:43 +02:00
Kim Kulling 010c0853ea
Update INSTALL 2021-04-04 14:40:50 +02:00
Kim Kulling eb261c6581
Merge pull request #3718 from MalcolmTyrrell/MalcolmTyrrell/tangentCheck
Malcolm tyrrell/tangent check
2021-04-03 18:28:03 +02:00
Kim Kulling 22413d85ad
Merge branch 'master' into MalcolmTyrrell/tangentCheck 2021-04-03 17:42:44 +02:00
Kim Kulling cfad36d0f4
Merge pull request #3737 from assimp/615IO-ios-port-update
615 io ios port update
2021-04-03 17:41:07 +02:00
Kim Kulling 7d68eab4a7 Update license 2021-04-03 12:09:23 +02:00
Kim Kulling d677005487 Merge branch '615IO-ios-port-update' 2021-04-03 12:08:38 +02:00
Kim Kulling 0b628a0ebb Merge branch 'ios-port-update' of https://github.com/615IO/assimp into 615IO-ios-port-update 2021-04-03 12:04:03 +02:00
Kim Kulling 456af8c493
Merge pull request #3736 from assimp/issue_3678
Issue 3678
2021-04-03 11:23:17 +02:00
Kim Kulling 80fc8538be
Update AMFImporter_Material.cpp 2021-04-03 10:29:16 +02:00
Kim Kulling d62c89557b
Remove dead code 2021-04-03 10:28:19 +02:00
Kim Kulling 46e49d0b83
Update AMFImporter_Geometry.cpp 2021-04-03 10:27:54 +02:00
Kim Kulling cdb6a62cdb
Merge branch 'master' into issue_3678 2021-04-03 10:27:07 +02:00
Kim Kulling da0543972b Fix parsing for AMF-Files. 2021-04-03 10:25:03 +02:00
Kim Kulling 89a8f87dae AMF: Remove unused macros 2021-04-02 13:10:24 +02:00
Kim Kulling 91cb2947ac
Merge pull request #3723 from eliasdaler/master
Add zlibstatic to the list of exported targets
2021-04-01 21:05:58 +02:00
Clement JACOB a25ef8a329
Merge branch 'master' into feature/gltf_fb_ngon_encoding 2021-04-01 20:35:16 +02:00
Kim Kulling 18af013c9e
Merge branch 'master' into master 2021-04-01 20:02:53 +02:00
Kim Kulling 577a8fc186
Merge pull request #3728 from assimp/kimkulling-patch-4
Update FUNDING.yml
2021-04-01 19:23:51 +02:00
Kim Kulling 658ffe3d2c
Update FUNDING.yml
Only use OpenCollective.
2021-04-01 17:21:12 +02:00
Kim Kulling 20e3261304
Merge pull request #3727 from assimp/kimkulling-patch-4
Update Readme.md
2021-04-01 17:20:38 +02:00
Kim Kulling 60794f3743
Update Readme.md 2021-04-01 17:07:35 +02:00
Clement JACOB 5d09105a49
Update mesh.h
Fixing ngon encoding flag value
2021-03-30 20:24:03 +02:00
Clement Jacob fc2c12ad6a Fixing encoding when lines and points are encountered 2021-03-30 09:58:28 +02:00
Clement Jacob fc0cf2ea8d NGON encoding triangles only 2021-03-30 09:19:50 +02:00
Clement Jacob 2e90fed527 Refactoring and fixing remaining issues in triangulation process 2021-03-30 09:10:50 +02:00
Clement Jacob 596001c89c Refactoring the extension 2021-03-30 09:10:50 +02:00
Clement Jacob 81019d5e58 Fixing quad encoding 2021-03-30 09:10:50 +02:00
Clement Jacob 6d1a0c6054 Adding quad proper handling 2021-03-30 09:10:50 +02:00
Clement Jacob 8e589221d7 [gltf2-exporter] Adding FB_ngon_encoding support 2021-03-30 09:10:50 +02:00
Kim Kulling 3880cd225c
Merge pull request #3721 from vfxgordon/fbxBlendshapes
Added Blendshape Support to FBX Export
2021-03-29 22:31:37 +02:00
Kim Kulling f61a41bdd9
Merge branch 'master' into fbxBlendshapes 2021-03-29 21:48:51 +02:00
Kim Kulling b5d4e50895
Merge pull request #3724 from bekraft/3ds-import-fix
Fixing 3DS import for CHUNK_TRMATRIX translation vector.
2021-03-29 20:34:55 +02:00
Bernold Kraft 09d3266250 Fixing 3DS import for CHUNK_TRMATRIX translation vector. 2021-03-29 15:31:08 +02:00