xiaohunqupo
|
688c259584
|
Merge pull request #2 from assimp/master
Merge From assimp/assimp master
|
2021-02-03 16:23:45 +08:00 |
thomasbiang
|
d08acb85e7
|
Merge branch 'master' into master
|
2021-02-02 14:48:41 -08:00 |
Kim Kulling
|
faf53b8e0f
|
Fix broken autocorrect fix
|
2021-02-02 23:33:02 +01:00 |
|
Kim Kulling
|
6ee1a32fb2
|
fix compile issue: replace std::make_unique
|
2021-02-02 22:54:20 +01:00 |
|
Kim Kulling
|
50fd5127ef
|
Some review findings.
|
2021-02-02 22:34:30 +01:00 |
ywang
|
793bd44cee
|
fix issue: 3482: invalid gltf2 properties
|
2021-02-02 13:19:57 -08:00 |
|
Kim Kulling
|
fa2354ebc3
|
Fix incorrect xml-parsing in collada importer.
|
2021-02-02 22:06:33 +01:00 |
contriteobserver
|
74b70cad79
|
fixed a typo
|
2021-02-01 23:44:57 -08:00 |
|
contriteobserver
|
800d5c23c3
|
implements a DefaultIOSystem that provides access to files bundled with Android Applications
addresses issue #3633
|
2021-02-01 23:33:55 -08:00 |
contriteobserver
|
65bc86e181
|
Merge branch 'master' into ColladaAnimationFix
|
2021-02-01 16:58:01 -08:00 |
RichardTea
|
aa10b56bc2
|
Fix draco linking for Hunter/Normal
|
2021-02-01 14:29:24 +00:00 |
|
RichardTea
|
b45723c384
|
Update JesseTG/rm to 1.0.2
Looks to be the current release
|
2021-02-01 13:24:27 +00:00 |
|
RichardTea
|
82773c29ad
|
Merge pull request #22 from rbsheth/issue_2195_hunter
Try adding Draco support through Hunter
|
2021-02-01 12:14:53 +00:00 |
Kim Kulling
|
5fbbba2fac
|
Merge branch 'master' into issue_2195_draco
|
2021-01-31 16:02:57 +01:00 |
|
contriteobserver
|
5a8e00b219
|
Merge branch 'master' into SignCompareFix
|
2021-01-30 16:57:22 -08:00 |
|
contriteobserver
|
c86dcbe1a8
|
cleaned up sign-compare unittest build warnings
addresses issue #3624
|
2021-01-30 16:49:32 -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 |
Minmin Gong
|
9aa6ec73ba
|
Export zlib if it's built outside
|
2021-01-29 20:51:09 -08:00 |
Rahul Sheth
|
a0116c6e01
|
Need to link against correct target
|
2021-01-29 17:22:16 -05:00 |
|
Rahul Sheth
|
62c991290b
|
Try adding Draco support through Hunter
|
2021-01-29 17:10:38 -05: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 |
|
contriteobserver
|
e33b69a428
|
Collada importer now identifies animations
addresses issue #3584
|
2021-01-28 13:06:02 -08:00 |
|
Kim Kulling
|
706d636c63
|
Merge branch 'master' into master
|
2021-01-28 18:25:39 +01:00 |
|
RichardTea
|
efae3b83b1
|
Draco requires default visibility on gcc/clang
|
2021-01-28 10:18:12 +00:00 |
|
RichardTea
|
48bcbbefdd
|
use nullptr and float constants
|
2021-01-27 10:56:57 +00:00 |
|
RichardTea
|
150514fc8b
|
Move draco warning suppression
Should be around the include for portability, not template instantiation
Fix clang pragma typos
|
2021-01-27 10:42:28 +00:00 |
|
RichardTea
|
5e7281dac6
|
Merge branch 'master' into issue_2195_draco
|
2021-01-27 10:26:16 +00:00 |
|
RichardTea
|
26ce6ba4f6
|
draco unit test when draco disabled
Should not load the draco file
|
2021-01-27 10:25:56 +00:00 |
|
RichardTea
|
f6862f9697
|
Disable draco on cmake prior to 3.12
|
2021-01-27 10:18:33 +00:00 |
|
RichardTea
|
6ec32b6b78
|
Apply clangformat
|
2021-01-27 09:55:03 +00:00 |
|
RichardTea
|
c6fd1ce996
|
glTF2 Minor cleanup
|
2021-01-27 09:42:49 +00:00 |
|
RichardTea
|
5b9d06c2fc
|
Disable draco clang/gcc warnings via pragma
draco templated functions also throw warnings
|
2021-01-27 09:19:35 +00: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 |