Commit Graph

9720 Commits

Author SHA1 Message Date
Kim Kulling
047b45d172 Fix apha value
- The alpha value in materials using the Tr format must be inverted
- closes https://github.com/assimp/assimp/issues/3645
2021-02-15 11:51:20 +01:00
Kim Kulling
607d474400 Merge pull request #3649 from assimp/kimkulling-patch-2
Update defs.h
2021-02-15 11:45:17 +01:00
Kim Kulling
52c66406fa Update defs.h 2021-02-12 20:59:45 +01:00
Kim Kulling
8a3a727865 Merge pull request #3644 from lgmcode/master
Eliminate maybe-uninitialized warnings which are treated as errors
2021-02-12 13:04:19 +01:00
Guangmo Lin
2d4bc2d04e Eliminate maybe-uninitialized warnings which are treated as errors when use -DCMAKE_BUILD_TYPE=Release 2021-02-09 14:10:44 +08:00
Kim Kulling
2cb0304e71 Merge pull request #3619 from contriteobserver/ColladaAnimationFix
Collada importer now identifies animations
2021-02-08 23:50:51 +01:00
Kim Kulling
c9ca921d09 Merge branch 'master' into ColladaAnimationFix 2021-02-08 20:46:18 +01:00
Kim Kulling
c50517d8df Merge pull request #3643 from Gargaj/patch-2
fix compile warning-turned-error on x86
2021-02-08 09:16:23 +01:00
Gargaj
8ae8b165ca fix compile warning-turned-error on x86 2021-02-08 00:37:06 +01:00
Kim Kulling
cb15a0d8b0 Merge branch 'master' into ColladaAnimationFix 2021-02-07 17:45:10 +01:00
Kim Kulling
be518e50e9 Merge pull request #3636 from thomasbiang/master
fix issue: 3482: invalid gltf2 properties
2021-02-06 22:38:30 +01:00
Kim Kulling
6c3593eda0 Merge branch 'master' into master 2021-02-06 09:54:51 +01:00
Kim Kulling
afbe8fb436 Merge pull request #3642 from assimp/fix_gcc_compiler_warning
Fix compiler warning: warning: argument to ... call is the same expre…
2021-02-06 09:53:22 +01:00
Kim Kulling
6b7b1caa06 Merge branch 'master' into fix_gcc_compiler_warning 2021-02-05 21:59:21 +01:00
Kim Kulling
b67ea99dc8 Merge pull request #3635 from assimp/issue_3564
Fix incorrect xml-parsing in collada importer.
2021-02-05 21:58:07 +01:00
Kim Kulling
6f759474bc Merge branch 'issue_3564' of https://github.com/assimp/assimp into issue_3564 2021-02-05 21:45:53 +01:00
Kim Kulling
710f1d17d4 RapidJSon: Upgrade to latest greatest 2021-02-05 21:45:37 +01:00
Kim Kulling
0e941c2478 Merge branch 'master' into issue_3564 2021-02-05 20:45:18 +01:00
Kim Kulling
ca823318c3 Merge branch 'issue_3564' of https://github.com/assimp/assimp into issue_3564 2021-02-05 20:44:54 +01:00
Kim Kulling
6784427287 Workaround: disable test which cause undefined behaviour. 2021-02-05 20:44:39 +01:00
kimkulling
4207c97c17 Fix compiler warning: warning: argument to ... call is the same expression as the source 2021-02-05 20:01:57 +01:00
Kim Kulling
c749591c72 Merge branch 'master' into ColladaAnimationFix 2021-02-05 15:52:50 +01:00
Kim Kulling
80e7f2a513 Merge branch 'master' into master 2021-02-05 12:30:24 +01:00
Kim Kulling
5cf5ca4a16 Merge pull request #3625 from contriteobserver/SignCompareFix
cleaned up sign-compare unittest build warnings
2021-02-05 12:28:46 +01:00
Kim Kulling
bb21ec9423 trigger build 2021-02-03 21:17:57 +01:00
Kim Kulling
2391432523 fix overflow 2021-02-03 21:07:28 +01:00
Kim Kulling
e6b8ae44cb Fix unittests: skip newline at begin of matrix token. 2021-02-03 20:54:48 +01: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
65bc86e181 Merge branch 'master' into ColladaAnimationFix 2021-02-01 16:58:01 -08: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
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