v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,598 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

11598 Commits (288d49b7219e34c6b29ade936ff369b94cbc7450)

Author SHA1 Message Date
Kim Kulling 288d49b721
Merge pull request #4895 from assimp/kimkulling/make_remove_empty_bones_optional_issue-4840 
Update LimitBoneWeightsProcess.cpp
 2023-01-20 19:33:41 +01:00
Kim Kulling 81cf1369db
Set correct number of bones in mesh instance 2023-01-20 19:20:06 +01:00
Kim Kulling ab0a119626
Update LimitBoneWeightsProcess.cpp 
- Removing empty bones only if AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES is enabled.
- closes https://github.com/assimp/assimp/issues/4840
 2023-01-20 19:14:04 +01:00
Kim Kulling 67eae8ee5a
Merge pull request #4878 from MMory/f-FixWhitespaceBetweenTagAndNum 
Fix #4877
 2023-01-17 20:04:47 +01:00
Martin Mory 7f6e96747b
Merge branch 'master' into f-FixWhitespaceBetweenTagAndNum 2023-01-17 13:32:39 +01:00
Kim Kulling d640a89035
Merge pull request #4879 from krishty/fix-build-with-m3d-import-only 
Fix #4262 Build With M3D Import Only
 2023-01-17 12:14:23 +01:00
Martin Mory a89d5c7cea
Merge branch 'master' into f-FixWhitespaceBetweenTagAndNum 2023-01-17 12:10:46 +01:00
Kim Kulling e9f95e5ab6
Merge branch 'master' into fix-build-with-m3d-import-only 2023-01-17 11:22:00 +01:00
Kim Kulling 6a8f169103
Merge pull request #4872 from drbct/fixJoinVerticesProcess 
Generalize JoinVerticesProcess for multiple UV and color channels
 2023-01-17 11:05:57 +01:00
Kim Kulling 19dec716d3
Merge branch 'master' into fixJoinVerticesProcess 2023-01-17 09:11:43 +01:00
Krishty 5cbc00a595 Fix Build With M3D Import Only 
`M3DWrapper.h` is designed to omit the definition of `class M3DWrapper` if neither M3D import nor M3D export are compiled.
608bccd9cf touched the corresponding preprocessor checks and introduced a bug:
```
#ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
#if !(ASSIMP_BUILD_NO_EXPORT || ASSIMP_BUILD_NO_M3D_EXPORTER)
class M3DWrapper {
```
When compiling
- with M3D import enabled,
- but with either export generally disabled or M3D export disabled specifically,
These checks evaluate to the wrong result and skip the definition, leading to a build failure in dependent code.
```
#if 1 // import enabled
#if !(1 || 1) // export disabled and M3D export disabled
```
This commit fixes the check to compile the definition if neither import is disabled.
 2023-01-16 08:29:49 +01:00
Martin Mory 43c0f8bb3d Remove whitespace between a <v> tag and the first number, otherwise first call to strtoul10() returns 0 and the indices are broken, leading to possible out-of-bound access and memory corruption/crash 2023-01-15 23:03:41 +01:00
Kim Kulling 70edec0efb
Merge pull request #4876 from assimp/kimkulling/remove_deprecated_comment_issue-4869 
Remove deprecated comment
 2023-01-15 20:42:31 +01:00
Kim Kulling 2d37f49f51
Remove deprecated comment 
- closes https://github.com/assimp/assimp/issues/4869
 2023-01-15 19:12:24 +01:00
Kim Kulling eb328ce69d
Merge pull request #4873 from tellypresence/improve-mMethod-typing 
Change mMethod type to enum aiMorphingMethod
 2023-01-13 10:31:45 +01:00
Steve M b2672c082d Change mMethod type to enum aiMorphingMethod 
Address sanitizer warning
 2023-01-12 12:35:28 -08:00
Daniel Rösner 74af523b3e Generalize JoinVerticesProcess for multiple UV and color channels 2023-01-12 13:13:46 +01:00
Kim Kulling 33c32b6b35
Merge pull request #4855 from asmaloney/spelling 
Fix several spelling mistakes
 2023-01-08 21:00:39 +01:00
Kim Kulling b393132b58
Merge branch 'master' into spelling 2023-01-08 17:43:55 +01:00
Kim Kulling 9ace81a3d2
Merge pull request #4863 from assimp/kimkulling/update_readme 
Update the getting help section
 2023-01-05 12:56:17 +01:00
Kim Kulling f6457e1c87
Update Readme.md 2023-01-05 11:34:12 +01:00
Kim Kulling fa7d3aa0c0
Update the getting help section 2023-01-05 11:32:01 +01:00
Kim Kulling 2af29f4836
Merge pull request #4861 from assimp/kimkulling/LWOAnimation_fix_division_by_zero_issue-4860 
Fix: Fix possible division by zero
 2023-01-04 09:37:41 +01:00
Kim Kulling 96b071bdb1
Fix: Fix possible division by zero 
- closes https://github.com/assimp/assimp/issues/4860
 2023-01-04 09:19:37 +01:00
Kim Kulling 767644cd3f
Merge pull request #4859 from assimp/kimkulling/fix_signed_unsigned_mismatch_warning-issue-4854 
Fix: Fix signed unsigned mismatch
 2023-01-03 21:24:17 +01:00
Kim Kulling df8a9bb2b8
Fix: Fix signed unsigned mismatch 
- closes https://github.com/assimp/assimp/issues/4854
 2023-01-03 21:11:09 +01:00
Kim Kulling 35162c19b2
Merge branch 'master' into spelling 2023-01-03 20:32:41 +01:00
Kim Kulling 8c57382b20
Merge pull request #4858 from asmaloney/cmake-remove-dead-code 
{cmake} Remove dead code
 2023-01-03 19:30:12 +01:00
Andy Maloney 465566a87e {cmake} Remove dead code 
BUILD_LIB_TYPE isn't used anywhere.

I think the intent with "add_definitions" here was to affect cmake (?), but it's actually just adding "#define DDL_STATIC_LIBRARY OFF" which isn't used in the code anywhere.
 2023-01-03 05:04:25 -05:00
Andy Maloney e893248e7c Fix several spelling mistakes & a comment 2023-01-01 13:31:48 -05:00
Kim Kulling 05279f8bbd
Merge pull request #4852 from sfjohnston/sfjohnston_mods 
sprintf to snprintf with known MAXLEN for buffer.
 2022-12-31 15:29:24 +01:00
sfjohnston 25f0146f44 sprintf to snprintf with known MAXLEN for buffer. 2022-12-28 12:32:11 -08:00
Kim Kulling 7eadcebc9f
Merge pull request #4850 from assimp/kimkulling/move_asserthandler_to_include_issue-4779 
Refactoring: Move asserthandler header to include
 2022-12-23 16:57:37 +01:00
Kim Kulling ef5dd8c451
Merge branch 'master' into kimkulling/move_asserthandler_to_include_issue-4779 2022-12-23 16:29:30 +01:00
Kim Kulling a8e50be781 Refactoring: Move asserthandler header to include 2022-12-23 16:19:39 +01:00
Kim Kulling 883667c61a
Merge pull request #4848 from assimp/kimkulling/unzip_fix_compiler_warning 
Update unzip.c
 2022-12-23 14:07:04 +01:00
Kim Kulling 89b5011759
Update unzip.c 
- Fix compiler warning.
 2022-12-23 13:50:16 +01:00
Kim Kulling 022c385571
Merge pull request #4846 from rohit-kumar-j/patch-1 
illegal token on right-side-of ::Windows
 2022-12-19 09:49:20 +01:00
Kim Kulling 76de8ba1f4
Update material.inl 2022-12-19 08:58:45 +01:00
RKJ 6743274b31
illegal token on right-side-of ::Windows 
Error without:
```
assimp\material.inl(101,47): message : error recovery skipped: ') ?'
```

Reference : https://stackoverflow.com/questions/2561368/illegal-token-on-right-side-of
 2022-12-19 04:06:36 +05:30
Kim Kulling 1e2cff6383
Merge pull request #4824 from umesh-huawei/master 
Fixed bug when exporting binary FBX
 2022-12-16 11:25:31 +01:00
Kim Kulling 376f66a06d
Merge branch 'master' into master 2022-12-16 10:11:56 +01:00
Kim Kulling 5c763f471c
Merge pull request #4838 from sashashura/patch-10 
Fixes Heap-buffer-overflow READ 1 in Assimp::ObjFileParser::getFace
 2022-12-16 09:18:23 +01:00
Kim Kulling c3d15a3f51
Fix minor review findings. 2022-12-16 09:03:40 +01:00
Kim Kulling c92b84e38d
Merge branch 'master' into patch-10 2022-12-16 09:00:41 +01:00
Kim Kulling 7c6e33fef1
Merge pull request #4837 from sashashura/patch-9 
Fixes Heap-buffer-overflow READ 1 in Assimp::MD5::MD5Parser::ParseHeader
 2022-12-15 15:08:16 +01:00
Kim Kulling db8ff41679
Update MD5Parser.cpp 2022-12-15 14:06:57 +01:00
Kim Kulling 2612950b7b
Merge branch 'master' into patch-9 2022-12-15 14:05:35 +01:00
Kim Kulling ee02c389ca
Merge pull request #4836 from sashashura/patch-8 
Fixes Heap-buffer-overflow READ 4 in Assimp::ScenePreprocessor::ProcssMesh
 2022-12-15 14:04:19 +01:00
sashashura 917352dd8b
Fixes Heap-buffer-overflow READ 1 in Assimp::ObjFileParser::getFace 
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49274
 2022-12-11 01:54:57 +01:00