51ad88afb6
Merge branch 'master' into master
2021-03-10 20:35:37 +01:00
cdd0fea6e8
Merge pull request #3694 from assimp/issue_3678
...
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-10 20:35:16 +01:00
806b12dc8b
Merge branch 'master' into issue_3678
2021-03-10 19:51:04 +01:00
520f64eeec
Fix missing trimming
2021-03-10 19:40:35 +01:00
732e9386aa
Merge branch 'master' into master
2021-03-10 11:49:13 +01:00
5c11ca6c8a
Merge branch 'master' into export_with_rotation
2021-03-10 18:25:09 +09:00
b6dced4b11
export with rotation
2021-03-10 18:06:42 +09:00
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
ed968367d5
Merge pull request #3687 from contriteobserver/NameManglingFix
...
applied extern "C" guards to importerdesc.h
2021-03-09 18:26:22 +01:00
e53335e58c
change file encoding
2021-03-09 18:31:15 +09:00
8a89ffa7a5
Merge branch 'master' into NameManglingFix
2021-03-09 00:01:23 +01:00
0ebab47ca2
updated MIN_IOS_VERSION to 10.0
2021-03-08 07:11:39 -06:00
dffaeade94
Update crypt.c
2021-03-08 09:04:22 +01:00
75144dd7fd
Merge pull request #3667 from thomasbiang/sparse_minmax
...
Export Min/Max for Sparse Accessor
2021-03-04 21:42:10 +01:00
2576c8c3a6
Compile fix for MSVC 2019
...
Small is seen as a type with some options so this fixes the errors starting with:
code\PostProcessing\ComputeUVMappingProcess.cpp(125): error C2632: 'int' followed by 'char' is illegal
2021-03-04 08:04:19 +01:00
c6c0f141f1
Fix compiling issues in clang-cl
2021-03-03 22:30:36 -08:00
fc955a5f8a
applied extern "C" guards to importerdesc.h
...
addresses #3685
2021-03-03 12:23:26 -08:00
ff769ecce2
Merge branch 'master' into sparse_minmax
2021-03-02 12:30:01 +01:00
e09e4ab670
Merge pull request #3683 from contriteobserver/PrecisionFix
...
workaround for ASSIMP_DOUBLE_PRECISION compile errors
2021-03-02 12:29:08 +01:00
75210576cf
Merge branch 'master' into sparse_minmax
2021-03-01 21:34:24 +01:00
6ab2e8d558
simplified the getRealAttribute implementation
2021-02-28 15:13:01 -08:00
111752cff0
workaround for ASSIMP_DOUBLE_PRECISION compile errors
...
changed float types to ai_real types as needed
addresses issue #3682
2021-02-28 14:45:39 -08:00
315362862a
Merge pull request #3660 from ademets/android_jniiosystem_cmake_patch
...
CMake fix for Android build with enabled JNI io system
2021-02-28 17:10:56 +01:00
20ef096db6
Merge branch 'master' into android_jniiosystem_cmake_patch
2021-02-28 13:33:02 +01:00
ff057dbcb2
Merge pull request #3681 from assimp/update_copyrights
...
Update copyrights to 2021.
2021-02-28 13:32:49 +01:00
c669c8f1eb
Merge branch 'master' into update_copyrights
2021-02-28 12:18:41 +01:00
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
9336341eac
Merge pull request #3680 from assimp/kimkulling-draco_disabled
...
Workaround for VS2019
2021-02-27 11:05:54 +01:00
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
143d134cd7
Merge branch 'master' into android_jniiosystem_cmake_patch
2021-02-26 08:34:23 +01:00
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
5b78e3fb5d
Merge branch 'master' into user/mavollme/GLTF2_CheckNormalCount
2021-02-25 21:29:03 +01:00
861829a04b
Merge pull request #3674 from assimp/kimkulling-issue_3664
...
Remove buggy assert
2021-02-25 14:21:12 +01:00
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
2bac0a6989
Merge pull request #3665 from turol/fix-warning
...
Silence uninitialized variable warning in 3MF importer
2021-02-25 11:09:37 +02:00
eef03c1f17
Improved warnings
2021-02-24 14:28:18 +00:00
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
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
5429475339
Merge branch 'master' into sparse_minmax
2021-02-23 12:30:53 -08:00
72efb4354a
Merge branch 'master' of https://github.com/thomasbiang/assimp into sparse_minmax
2021-02-23 12:12:36 -08:00
3c79b12e02
Merge pull request #3659 from gongminmin/FixAnimName
...
Export the animation name to gltf2
2021-02-23 20:39:16 +01:00
247fd0ce17
Merge branch 'master' into FixAnimName
2021-02-22 20:38:16 +01:00
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
616d924d29
Merge branch 'master' into master
2021-02-20 19:35:31 +01:00
26ebeaea5c
Merge pull request #3620 from gongminmin/ExportZLib
...
Export zlib if it's built outside
2021-02-19 18:32:37 +01:00
3651dd5bbc
Merge branch 'master' into ExportZLib
2021-02-19 15:51:21 +01:00
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
6094da3493
Update glTF2Asset.inl
2021-02-18 09:32:37 +01:00
cdf786d171
Merge branch 'master' into issue_2195_draco
2021-02-18 09:19:38 +01:00
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
Kim Kulling
jaefunk
ethan
Matthew Wallace
Paul Engelhardt
Andy Shaw
Minmin Gong
contriteobserver
Turo Lamminen
Max Vollmer (Microsoft Havok)
Turo Lamminen
thomasbiang
ywang
Alex