xiaohunqupo
|
688c259584
|
Merge pull request #2 from assimp/master
Merge From assimp/assimp master
|
2021-02-03 16:23:45 +08:00 |
|
Kim Kulling
|
754b2ba434
|
Merge pull request #3607 from contriteobserver/ColladaSubmeshFix
ColladaLoader now assigns individual material indices to submeshes as needed
|
2021-01-30 08:19:13 +01:00 |
|
Kim Kulling
|
f2543ee608
|
Merge branch 'master' into ColladaSubmeshFix
|
2021-01-29 22:11:07 +01:00 |
|
Kim Kulling
|
d87d9f2094
|
Merge pull request #3604 from bsekura/develop
Changed morph anim error to warning when validating
|
2021-01-29 22:10:34 +01:00 |
|
Kim Kulling
|
de827b2fec
|
Merge branch 'master' into develop
|
2021-01-29 21:46:42 +01:00 |
|
Kim Kulling
|
65f3569d61
|
Merge pull request #3623 from assimp/update_cmake_min_req
Update all minimum cmake req to 3.10
|
2021-01-29 21:40:22 +01:00 |
|
Kim Kulling
|
79eb9ecc86
|
Update all minimum cmake req to 3.10
|
2021-01-29 21:05:46 +01:00 |
|
Kim Kulling
|
2e3d72abd3
|
Merge pull request #3622 from assimp/metadata_leak
Fixes a mem leak in aiMetadata::Set
|
2021-01-29 20:48:03 +01:00 |
|
Kim Kulling
|
79a442f95d
|
Fixes a mem leak in aiMetadata::Set
|
2021-01-29 20:25:02 +01:00 |
|
Kim Kulling
|
db8e9eb556
|
Merge branch 'master' into develop
|
2021-01-29 19:20:38 +01:00 |
|
Kim Kulling
|
3174a9cac8
|
Merge pull request #3598 from thomasbiang/master
GLTF2: Allow Export Node in TRS format
|
2021-01-29 19:20:10 +01:00 |
|
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 |
|
contriteobserver
|
d7bf513250
|
renaming iterator to avoid any possibility of scop collisions
|
2021-01-26 01:36:12 -08:00 |
|
contriteobserver
|
69fc809307
|
size_t is not the same as unsigned int on some systems
|
2021-01-26 01:01:59 -08:00 |
|
contriteobserver
|
f92a34e0b7
|
Merge branch 'master' into ColladaSubmeshFix
|
2021-01-26 00:38:37 -08:00 |
|
Kim Kulling
|
4017a6da26
|
Merge branch 'master' into issue_3573
|
2021-01-25 20:48:31 +01:00 |
|
xiaohunqupo
|
fbc45fecec
|
Merge pull request #1 from assimp/master
Merge From assimp/assimp master
|
2021-01-25 14:12:28 +08: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 |
|
contriteobserver
|
b48e19c28f
|
Merge branch 'master' into ColladaSubmeshFix
|
2021-01-24 02:30:31 -08: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 |
|
contriteobserver
|
338abded12
|
ColladaLoader now assigns individual materials to submeshes as needed
Optional assignment of individual materials to submeshes, addresses #3606
|
2021-01-23 02:20:58 -08:00 |
|
Bart Sekura
|
5f50e42535
|
added missing return
|
2021-01-23 09:56:35 +09:00 |
|
Bart Sekura
|
f8c512acd7
|
changed morph anim error to warning when validating
|
2021-01-23 09:52:46 +09: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 |
|