Commit Graph

11711 Commits (e2fa181aa6b07ec1d7d2ec40ce040228c28e273f)

Author SHA1 Message Date
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
Kazuki Y 6c95fe19d0
Merge branch 'master' into fix-artifact 2022-12-29 23:46:13 +09:00
Kazuki Y 26e4ab2a23
Merge branch 'assimp:master' into master 2022-12-29 23:44:30 +09:00
Kazuki Y a84bf34cbb
Update ccpp.yml 2022-12-29 23:43:07 +09:00
sfjohnston 25f0146f44 sprintf to snprintf with known MAXLEN for buffer. 2022-12-28 12:32:11 -08:00
Kazuki Y cd0bbe15af
Merge branch 'master' into fix-artifact 2022-12-28 22:07:07 +09: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
Kazuki Y d04dd1af9b
Merge branch 'master' into fix-artifact 2022-12-21 22:35:35 +09:00
Kazuki Y b406ce6707
Merge branch 'assimp:master' into master 2022-12-20 19:24:15 +09: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
Kazuki Y 2c87088079
Update ccpp.yml 2022-12-17 21:49:28 +09:00
Kazuki Y 2ec097b862
Update ccpp.yml 2022-12-17 21:06:36 +09:00
Kazuki Y dd313da24f
Update ccpp.yml 2022-12-17 21:04:11 +09:00
Kazuki Y 5925dcd0e2
Update ccpp.yml 2022-12-17 15:08:25 +09:00
Kazuki Y 9b644494ed
Merge branch 'assimp:master' into master 2022-12-17 15:00:20 +09:00
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
Kazuki Y b1a700dbbc
Merge pull request #1 from NeosSharedProject/TestPatch
Update ccpp.yml
2022-12-12 12:43:51 +09:00
Kazuki Y f77db867b5
Update ccpp.yml 2022-12-12 12:43:34 +09:00
kazu0617 4b523e99c4
fix ccpp.yml - build both hunter or not 2022-12-12 12:13:37 +09:00
kazu0617 53f0d5dcbd
fix ccpp.yml -- fix matrix.name check for artifact 2022-12-12 10:55:13 +09:00