Commit Graph

9592 Commits (d7cf7847baa167b63c13d835a5ac3d37188af0c4)

Author SHA1 Message Date
thomasbiang d7cf7847ba
Merge branch 'master' into master 2021-01-20 18:47:39 -08:00
ywang 01e61c8b9f customized node transformation format 2021-01-20 18:42:56 -08:00
Kim Kulling c52e5c4da8
Merge pull request #3592 from assimp/kimkulling-oss_fuzz29168
Fix nullptr access
2021-01-20 08:32:42 +01:00
Kim Kulling f8dd3a9aa6
Update DefaultIOSystem.cpp 2021-01-20 08:05:43 +01:00
Kim Kulling ed3e745752
Update DefaultIOSystem.cpp 2021-01-19 21:58:04 +01:00
Kim Kulling f05a57560b
Remove buggy method. 2021-01-19 21:27:50 +01:00
Kim Kulling 22f632d8d0
Merge branch 'master' into kimkulling-oss_fuzz29168 2021-01-19 21:21:28 +01:00
Kim Kulling 5b325af79f
Fix typo. 2021-01-19 21:19:42 +01:00
Kim Kulling 62e231b452
Merge pull request #3579 from ihsinme/ihsinme-patch-210
fixed memory leak
2021-01-19 21:18:34 +01:00
Kim Kulling 5a6498af92
Fix nullptr access 2021-01-19 21:14:38 +01:00
Kim Kulling 4008862a35
Merge branch 'master' into ihsinme-patch-210 2021-01-19 21:05:43 +01:00
Kim Kulling d12b1e8d70
Merge pull request #3591 from h3xx/fix-unzip-ftbfs
Fix build failure on Linux
2021-01-19 21:02:25 +01:00
Dan Church 0bc5cf9fd3
Fix build failure on Linux 2021-01-18 16:17:28 -06:00
Kim Kulling 5a7f212162
Merge branch 'master' into ihsinme-patch-210 2021-01-18 21:55:42 +01:00
Kim Kulling 9a30887117
Merge pull request #3590 from assimp/kimkulling-oss_fuzz29401
Fix nullptr dereference in scenepreprocessor
2021-01-18 21:55:08 +01:00
Kim Kulling f24c042925
Fix typo 2021-01-18 20:28:38 +01:00
Kim Kulling 0803e5e6f3
Fix nullptr dereference in scenepreprocessor 2021-01-18 20:25:33 +01:00
Kim Kulling 0eb9005bc1
Merge pull request #3589 from assimp/kimkulling-off_fuzz28288
Fix overflow in aiString
2021-01-18 20:19:01 +01:00
Kim Kulling 11ee9d3673
Update types.h 2021-01-18 19:46:32 +01:00
Kim Kulling 5a764fff04
Fix overflow in aiString 2021-01-18 19:44:10 +01:00
Kim Kulling 3c1d8850a4
Merge pull request #3586 from assimp/kimkulling-ossfuzz_issue29655
Fix Divide-by-zero in vector3
2021-01-17 20:53:45 +01:00
Kim Kulling 658fec3e61
Fix cast 2021-01-17 20:41:44 +01:00
Kim Kulling 0969bf3500
Fix Divide-by-zero in vector3
Fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=29655
2021-01-17 20:39:19 +01:00
Kim Kulling 061ef1f263
Merge pull request #3578 from gkv311/master
aiMaterial::GetTexture() - fix misleading description of path argument.
2021-01-16 17:16:05 +01:00
Kim Kulling aed0b3e53b
Merge branch 'master' into master 2021-01-16 16:37:57 +01:00
Kim Kulling 918c3abb32
Merge pull request #3585 from assimp/kimkulling-fix-zlib-deployment
remove install of zlibstatic
2021-01-16 16:25:29 +01:00
Kim Kulling 9334e07619
Update CMakeLists.txt 2021-01-16 16:14:49 +01:00
Kim Kulling 8ad2661e0c
Update CMakeLists.txt 2021-01-16 12:00:42 +01:00
Kim Kulling 6db343386b
remove install of zlibstatic 2021-01-15 16:46:15 +01:00
Kim Kulling 8125e06f49
Merge branch 'master' into master 2021-01-14 19:03:16 +01:00
Kim Kulling a9705e346a
Merge branch 'master' into ihsinme-patch-210 2021-01-14 17:21:44 +01:00
Kim Kulling e3d39b9f66
Merge pull request #3583 from assimp/kimkulling-replace_sstrcasecmp
Remove dependency to posix-extension function
2021-01-14 12:06:24 +01:00
Kim Kulling 484ac21ef5
Remove dependency to posix-extension function 2021-01-14 11:53:25 +01:00
Kim Kulling 6d6a6ac11e
Merge pull request #3575 from ms-maxvollmer/gltf2_buffer_fixes
Fixes for GLTF2 buffers
2021-01-14 09:57:39 +01:00
Kim Kulling 87a6305cf0
Merge branch 'master' into gltf2_buffer_fixes 2021-01-12 18:32:17 +01:00
Kim Kulling 20873cb142
Merge pull request #3581 from assimp/build_fixes
Use const instead of constexpr
2021-01-12 18:31:53 +01:00
ihsinme 070072370d
Update AMFImporter_Material.cpp 2021-01-12 15:43:40 +03:00
ihsinme 2e96366d04
Update AMFImporter_Geometry.cpp 2021-01-12 15:40:19 +03:00
kkulling 9174bca3f7 closes https://github.com/assimp/assimp/issues/3517: use const instead of constexpr 2021-01-12 10:01:53 +01:00
Kirill Gavrilov 0c2772e8bf aiMaterial::GetTexture() - fix misleading description of path argument.
Mention aiScene::GetEmbeddedTexture() as a proper way to check if returned path
points to a file or to embedded texture.
2021-01-12 01:00:45 +03:00
Max Vollmer d49aed4585 * Check that buffer view has buffer
* Handle integer overflow when calculating byte length
* Minor code cleanup for exception messages
2021-01-11 08:45:47 +00:00
Kim Kulling ec08092dbf
Merge pull request #3571 from JacksonM8/issue_3570
Issue 3570 (CMake Policy violations on MSVC)
2021-01-09 08:41:28 +01:00
Kim Kulling 68be7c77c0
Merge branch 'master' into issue_3570 2021-01-08 15:22:14 +01:00
Kim Kulling 1e81bed4d0
Merge pull request #3561 from ffontaine/master
contrib/zlib/CMakeLists.txt: don't install zlib
2021-01-07 11:05:37 +01:00
Kim Kulling d898ecc80c
Fix another typo. 2021-01-06 18:59:13 +01:00
Kim Kulling 2ad4218d25
Merge branch 'master' into master 2021-01-06 18:54:57 +01:00
Kim Kulling 5222ab989f
Fix a typo 2021-01-06 18:51:59 +01:00
Kim Kulling b23ecb4864
Update CMakeLists.txt
- Update minimum cmake version
- install for win32-platforms to avoid conflicts with targets for win32
2021-01-06 18:51:30 +01:00
JacksonM8 a01ef5374c
Merge branch 'master' into issue_3570 2021-01-07 01:47:06 +10:30
Kim Kulling 53c03fa364
Merge pull request #3569 from ihsinme/master
fix of an unattainable condition.
2021-01-06 16:00:46 +01:00