Commit Graph

9666 Commits (8d4b816dfe3db73385a7c900501bfbad11197201)

Author SHA1 Message Date
Kim Kulling 8d4b816dfe
Merge branch 'master' into master 2021-01-29 18:16:04 +01:00
Kim Kulling 1afc4c045e
Merge pull request #3608 from villevoutilainen/master
GCC 11 build fixes
2021-01-29 11:32:53 +01:00
Kim Kulling 706d636c63
Merge branch 'master' into master 2021-01-28 18:25:39 +01:00
Kim Kulling b2af2b2137
Merge pull request #3616 from assimp/kimkulling-issue_3572
Fix compiler bug for VS2019
2021-01-27 09:59:56 +01:00
Kim Kulling 1e38f84c3a
fix typo 2021-01-27 09:40:19 +01:00
Kim Kulling ac0f1f2cab
Update FBXMaterial.cpp 2021-01-27 09:37:35 +01:00
Kim Kulling c02ad323a5
Fix VS compiler warning: convertig int to char 2021-01-27 09:22:59 +01:00
thomasbiang 4ed9f3c2f4
Merge branch 'master' into master 2021-01-26 13:55:40 -08:00
Kim Kulling 4471c36c08
Fix compiler bug for VS2019
- Check https://developercommunity.visualstudio.com/content/problem/1223143/visual-studio-2019-c-program-crash-with-stdstring.html for more details
- closes https://github.com/assimp/assimp/issues/3572
2021-01-26 20:59:21 +01:00
Kim Kulling 83d4227e5c
Merge pull request #3597 from RichardTea/issue_3573
Increase float and double string export precision
2021-01-26 20:41:57 +01:00
Kim Kulling 1950247329
Merge branch 'master' into issue_3573 2021-01-26 19:38:18 +01:00
Kim Kulling 2cd6cd603c
Merge pull request #3615 from assimp/kimkulling-funding_update
Replace patreon by opencollective
2021-01-26 18:51:29 +01:00
Kim Kulling c12f747bde
Merge branch 'master' into kimkulling-funding_update 2021-01-26 18:25:07 +01:00
Kim Kulling b6b061b21a
Merge pull request #3610 from assimp/kimkulling-remove_appveyor
Delete appveyor.yml
2021-01-26 18:24:47 +01:00
Kim Kulling 95fe3e98a6
Merge branch 'master' into kimkulling-remove_appveyor 2021-01-26 18:09:43 +01:00
Kim Kulling 0244aec0a5
Update Readme.md 2021-01-26 18:09:25 +01:00
Kim Kulling d04b1b9e2e
Replace patreon by opencollective 2021-01-26 18:08:20 +01:00
Kim Kulling 4017a6da26
Merge branch 'master' into issue_3573 2021-01-25 20:48:31 +01:00
Kim Kulling 294d4230b0
Merge pull request #3612 from assimp/kimkulling-issue_3601
Add missing skip
2021-01-24 18:59:03 +01:00
Kim Kulling 243d017463
Add missing skip
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
2021-01-24 18:47:50 +01:00
Kim Kulling 47dd6c0786
Merge pull request #3611 from assimp/kimkulling-issue_3599
Fix typo in collada parser
2021-01-24 18:37:16 +01:00
Kim Kulling a2b889ab09
Fix typo in collada parser
closes https://github.com/assimp/assimp/issues/3599
2021-01-24 18:21:46 +01:00
Kim Kulling e18261953d
Delete mtime_cache 2021-01-24 18:14:43 +01:00
Kim Kulling 7a706be920
Delete cacheglobs.txt 2021-01-24 18:14:36 +01:00
Kim Kulling dd0facd722
Delete appveyor.yml 2021-01-24 18:14:00 +01:00
Ville Voutilainen ec141a94c3
Merge branch 'master' into master 2021-01-24 11:22:24 +02:00
Kim Kulling 9dc95be939
Merge pull request #3596 from RichardTea/vs_gitignore_update
Update gitignore for default VS2019 behaviour
2021-01-24 10:07:08 +01:00
Ville Voutilainen 6ebae5e67c GCC 11 build fixes 2021-01-24 11:04:46 +02:00
Kim Kulling 5390e035d5
Merge branch 'master' into vs_gitignore_update 2021-01-24 09:47:12 +01:00
thomasbiang 91dc904ed1
Merge branch 'master' into master 2021-01-22 13:25:31 -08:00
Kim Kulling 28c9bccbef
Merge pull request #3603 from assimp/kimkulling-remove_redundancy
Remove redundant statement in if
2021-01-22 14:36:59 +01:00
Kim Kulling e792455d66
Remove redundant statement in if
- closes https://github.com/assimp/assimp/issues/3180
2021-01-22 14:22:34 +01:00
Kim Kulling e321367dae
Merge pull request #3602 from assimp/kimkulling-issue3151
Update 3DSLoader.cpp
2021-01-22 14:18:20 +01:00
Kim Kulling dc4514de82
Update COBLoader.cpp
Fix cppcheck finding
2021-01-22 13:23:39 +01:00
Kim Kulling 0dcd72d420
Update IFCOpenings.cpp 2021-01-22 13:18:43 +01:00
Kim Kulling f44572157a
Update 3DSLoader.cpp 2021-01-22 13:14:59 +01:00
Kim Kulling 6293c22c5c
Merge branch 'master' into vs_gitignore_update 2021-01-22 12:59:42 +01:00
Kim Kulling c9c54822fd
Merge pull request #3594 from xiaohunqupo/master
Fix STL Expoter error.
2021-01-22 12:59:18 +01:00
Kim Kulling f2d3f0dbe6
Merge branch 'master' into master 2021-01-22 12:35:44 +01:00
Kim Kulling 71e8c1001e
Merge pull request #3582 from makitsune/fix-gltf-vertex-colors
Fix glTF vertex colors with types other than float
2021-01-22 09:51:37 +01:00
Kim Kulling e435a43e53
Merge branch 'master' into fix-gltf-vertex-colors 2021-01-22 08:04:04 +01:00
Kim Kulling b64f1c40f4
Merge pull request #3600 from assimp/kimkulling-doc
Update Build.md
2021-01-22 07:59:18 +01:00
thomasbiang b3a35364ad
Merge branch 'master' into master 2021-01-21 13:38:21 -08:00
Kim Kulling 345726f5c8
Update Build.md 2021-01-21 20:56:21 +01:00
Kim Kulling 2bcf08370d
Merge branch 'master' into fix-gltf-vertex-colors 2021-01-21 11:54:02 +01:00
Kim Kulling 5e21b9f72d
Merge pull request #3580 from mmp/tdb/pbrt3_exporter
pbrt-v4 exporter
2021-01-21 11:48:19 +01:00
Kim Kulling 0b9cbb53ab
Merge branch 'master' into tdb/pbrt3_exporter 2021-01-21 11:27:35 +01:00
Kim Kulling fabea8ccd0
Merge pull request #3587 from assimp/build_fixes
Win32-refactorings
2021-01-21 11:26:45 +01:00
Kim Kulling 7dcac538f8
Merge branch 'master' into build_fixes 2021-01-21 09:03:06 +01:00
thomasbiang d7cf7847ba
Merge branch 'master' into master 2021-01-20 18:47:39 -08:00