Kim Kulling
|
20ef096db6
|
Merge branch 'master' into android_jniiosystem_cmake_patch
|
2021-02-28 13:33:02 +01:00 |
|
Kim Kulling
|
ff057dbcb2
|
Merge pull request #3681 from assimp/update_copyrights
Update copyrights to 2021.
|
2021-02-28 13:32:49 +01:00 |
|
Kim Kulling
|
c669c8f1eb
|
Merge branch 'master' into update_copyrights
|
2021-02-28 12:18:41 +01:00 |
Kim Kulling
|
9e8dbd0ca5
|
Update copyrights to 2021.
|
2021-02-28 12:17:54 +01:00 |
|
Kim Kulling
|
9336341eac
|
Merge pull request #3680 from assimp/kimkulling-draco_disabled
Workaround for VS2019
|
2021-02-27 11:05:54 +01:00 |
|
Kim Kulling
|
21c2f8bc9c
|
Workaround for VS2019
- DRACO is disabled as the default
- Use ASSIMP_BUILD_DRACO=ON to reenable it
- Workaround for https://github.com/assimp/assimp/issues/3663
|
2021-02-27 10:01:09 +01:00 |
|
Kim Kulling
|
143d134cd7
|
Merge branch 'master' into android_jniiosystem_cmake_patch
|
2021-02-26 08:34:23 +01:00 |
|
Kim Kulling
|
05ee5432f6
|
Merge pull request #3670 from ms-maxvollmer/user/mavollme/GLTF2_CheckNormalCount
Check that normal count and tangent count match vertex count.
|
2021-02-25 22:18:07 +01:00 |
|
Kim Kulling
|
5b78e3fb5d
|
Merge branch 'master' into user/mavollme/GLTF2_CheckNormalCount
|
2021-02-25 21:29:03 +01:00 |
|
Kim Kulling
|
861829a04b
|
Merge pull request #3674 from assimp/kimkulling-issue_3664
Remove buggy assert
|
2021-02-25 14:21:12 +01:00 |
|
Kim Kulling
|
aa6f983920
|
Remove buggy assert
- Remove assertion test for empty nodestacks when no meshes are in the node. Just return from the function.
- closes https://github.com/assimp/assimp/issues/3664
|
2021-02-25 14:01:18 +01:00 |
Turo Lamminen
|
2bac0a6989
|
Merge pull request #3665 from turol/fix-warning
Silence uninitialized variable warning in 3MF importer
|
2021-02-25 11:09:37 +02:00 |
Max Vollmer (Microsoft Havok)
|
eef03c1f17
|
Improved warnings
|
2021-02-24 14:28:18 +00:00 |
|
Max Vollmer (Microsoft Havok)
|
facb7da701
|
Check that normal count and tangent count matches vertex count. Ignore data and warn if counts don't match.
|
2021-02-24 14:19:29 +00:00 |
Turo Lamminen
|
3e1c785d31
|
[3MF] Silence uninitialized variable warning
This is a false positive but the compiler can't see it
|
2021-02-24 10:59:59 +02:00 |
thomasbiang
|
5429475339
|
Merge branch 'master' into sparse_minmax
|
2021-02-23 12:30:53 -08:00 |
ywang
|
72efb4354a
|
Merge branch 'master' of https://github.com/thomasbiang/assimp into sparse_minmax
|
2021-02-23 12:12:36 -08:00 |
|
Kim Kulling
|
3c79b12e02
|
Merge pull request #3659 from gongminmin/FixAnimName
Export the animation name to gltf2
|
2021-02-23 20:39:16 +01:00 |
|
Kim Kulling
|
247fd0ce17
|
Merge branch 'master' into FixAnimName
|
2021-02-22 20:38:16 +01:00 |
|
Kim Kulling
|
d40f0390e3
|
Merge pull request #3650 from lgmcode/master
Eliminate MSVC warning C4819 caused by source files encoded in UTF-8 without BOM
|
2021-02-22 20:30:41 +01:00 |
|
Kim Kulling
|
616d924d29
|
Merge branch 'master' into master
|
2021-02-20 19:35:31 +01:00 |
|
Kim Kulling
|
26ebeaea5c
|
Merge pull request #3620 from gongminmin/ExportZLib
Export zlib if it's built outside
|
2021-02-19 18:32:37 +01:00 |
|
Kim Kulling
|
3651dd5bbc
|
Merge branch 'master' into ExportZLib
|
2021-02-19 15:51:21 +01:00 |
|
Kim Kulling
|
80423ff5f0
|
Merge pull request #3614 from RichardTea/issue_2195_draco
Implement import of Draco-encoded glTFv2 models
|
2021-02-19 12:13:56 +01:00 |
|
Kim Kulling
|
6094da3493
|
Update glTF2Asset.inl
|
2021-02-18 09:32:37 +01:00 |
|
Kim Kulling
|
cdf786d171
|
Merge branch 'master' into issue_2195_draco
|
2021-02-18 09:19:38 +01:00 |
Alex
|
2fd6666477
|
Update CMakeLists.txt
Add android_jniiosystem to export set, for cmake to find and link with
|
2021-02-17 23:16:22 -08:00 |
|
Kim Kulling
|
1d376fa91f
|
Merge pull request #3653 from jkvargas/master
Rust bindings
|
2021-02-17 19:00:31 +01:00 |
Minmin Gong
|
d57b78bc98
|
Export the animation name to gltf2
|
2021-02-16 20:22:08 -08:00 |
Jhonny Knaak de Vargas
|
6130e53cdf
|
Adding rust port to documentation
|
2021-02-15 21:05:36 +00:00 |
RichardTea
|
f1d225c18d
|
Merge branch 'master' into issue_2195_draco
|
2021-02-15 18:05:22 +00:00 |
|
Kim Kulling
|
7be65aead7
|
Merge pull request #3634 from contriteobserver/BundledAndroid
Implements access to files bundled with Android Applications
|
2021-02-15 14:01:54 +01:00 |
|
Kim Kulling
|
242e9c21a9
|
Update BundledAssetIOSystem.cpp
|
2021-02-15 13:44:07 +01:00 |
|
Kim Kulling
|
dac7243b94
|
Update BundledAssetIOSystem.h
|
2021-02-15 13:43:39 +01:00 |
|
Kim Kulling
|
5f1f2a65ce
|
Merge branch 'master' into BundledAndroid
|
2021-02-15 13:43:20 +01:00 |
|
Kim Kulling
|
1279862e31
|
Merge pull request #3652 from assimp/kimkulling-issue_3645
Fix apha value
|
2021-02-15 12:12:38 +01:00 |
|
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 |
Guangmo Lin
|
ba7f945f99
|
Eliminate MSVC warning C4819 caused by source files encoded in UTF-8 without BOM
|
2021-02-14 10:28:14 +08: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 |
|
Kim Kulling
|
426c1a340f
|
Merge branch 'master' into issue_2195_draco
|
2021-02-10 15:28:39 +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
|
888415246e
|
Merge branch 'master' into issue_2195_draco
|
2021-02-08 11:52:54 +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 |