Commit Graph

12069 Commits (693d681813625948c7ac6d6ac2ed7f9d4613f616)

Author SHA1 Message Date
Kim Kulling 693d681813
Merge branch 'master' into patch-2 2023-06-15 10:40:05 +02:00
Kim Kulling 3939d35f18
Merge pull request #5138 from sashashura/4709035804065792
Fix UNKNOWN WRITE in Assimp::SortByPTypeProcess::Execute
2023-06-15 10:39:17 +02:00
Alex 36dfa3bed3 Fix UNKNOWN WRITE in Assimp::SortByPTypeProcess::Execute 2023-06-14 15:50:50 +00:00
Kim Kulling 4180b1fd08
Merge pull request #5134 from sashashura/memleak
Fix memory leak
2023-06-13 20:18:37 +02:00
Kim Kulling 3ccf242bdb
Merge branch 'master' into memleak 2023-06-13 19:46:56 +02:00
Kim Kulling feb0303fd0
Merge pull request #5090 from FlorianBorn71/FixSkinnedWeightsAfterVertexRemappingOptimization
Skinning weights in gltf were broken by PR#5003 (vertex remapping)
2023-06-09 00:23:08 +02:00
Kim Kulling bef66deeda
Update glTF2Importer.h 2023-06-08 20:56:14 +02:00
Kim Kulling 1ab4161cd7
Update glTF2Importer.cpp 2023-06-08 20:55:48 +02:00
Kim Kulling 186d7fd606
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-06-08 13:16:08 +02:00
Kim Kulling 9950bb4ed6
Merge pull request #5110 from sashashura/4890437695700992
Fix Heap-buffer-overflow READ in Assimp::MD5::MD5MeshParser::MD5MeshParser
2023-06-08 13:15:35 +02:00
Kim Kulling 11dede8fc4
Merge branch 'master' into 4890437695700992 2023-06-08 13:02:15 +02:00
Kim Kulling d5844f26b5
Merge pull request #5103 from mosfet80/patch-1
Update cpp-pm / hunter
2023-06-08 13:01:35 +02:00
Kim Kulling 839bed3274
Merge branch 'master' into patch-1 2023-06-07 18:38:57 +02:00
Alex 4c16a6a16b Fix memory leak 2023-06-07 07:02:50 +00:00
Kim Kulling 49a6eec294
Merge pull request #5133 from Biohazard90/Fix-removeEmptyBones-cannot-be-disabled
Fixed missing config property lookup for removal of empty bones.
2023-06-07 08:19:23 +02:00
Kristjan Skutta cb86029153 Fixed missing config property lookup for removal of empty bones. 2023-06-06 14:30:35 +02:00
Kim Kulling d9268dcf96
Merge branch 'master' into patch-1 2023-06-05 18:36:35 +02:00
Kim Kulling 02d5ab294c
Merge pull request #5129 from sashashura/4875566380220416
Fix UNKNOWN READ in aiTexture::~aiTexture
2023-06-05 18:35:56 +02:00
mosfet80 05ab5c2e3b
Delete old unused patch
Remove old file poly2tri_patch.txt
2023-06-04 22:49:12 +02:00
Kim Kulling 513e62e1c9
Merge branch 'master' into 4875566380220416 2023-06-04 20:42:37 +02:00
Alex 23f9990b22 Fix UNKNOWN READ in aiTexture::~aiTexture 2023-06-04 07:50:00 +00:00
Kim Kulling 915e146307
Merge pull request #5125 from mosfet80/updatePugiXML
Update pugiXML library
2023-06-03 21:26:13 +02:00
Alex 5cc4a61d66 Fix Heap-buffer-overflow READ in Assimp::MD5::MD5MeshParser::MD5MeshParser 2023-06-03 16:30:50 +02:00
mosfet80 62cefd5b27 Update pugiXML library
Release highlights:

xml_attribute::set_value, xml_node::set_value and xml_text::set now have overloads that accept pointer to non-null-terminated string and size
Fix error handling in xml_document::save_file that could result in the function succeeding while running out of disk space
Fix memory leak during error handling of some out-of-memory conditions during xml_document::load
2023-06-03 11:16:39 +02:00
Kim Kulling b6c0fdd6e0
Merge branch 'master' into patch-1 2023-06-01 00:12:26 +02:00
Kim Kulling d9a8837a5b
Merge pull request #5112 from sashashura/6337324114116608
Fix Heap-buffer-overflow WRITE in Assimp::ObjFileImporter::createVertexArray
2023-05-31 23:31:38 +02:00
Kim Kulling 628dde4a91
Merge branch 'master' into 6337324114116608 2023-05-31 21:30:47 +02:00
Kim Kulling c22ddfda2b
Merge pull request #5114 from assimp/kimkulling/update_docker_image
Update_ Use latest ubuntu image and switch to ninja
2023-05-31 21:24:16 +02:00
Kim Kulling 1538669f70 Update_ Use latest ubuntu image and switch to ninja 2023-05-31 20:45:51 +02:00
Alex 54f5d01190 Fix Heap-buffer-overflow WRITE in Assimp::ObjFileImporter::createVertexArray 2023-05-31 11:37:15 +00:00
mosfet80 462755e5ba
Update CMakeLists.txt
fix sha1
2023-05-30 16:26:30 +02:00
mosfet80 1f5c7da822
Update CMakeLists.txt 2023-05-30 16:23:57 +02:00
Kim Kulling bee751b5f9
Merge pull request #5109 from assimp/C-Tech-Development-Corp-gltf2_metadata_export
C tech development corp gltf2 metadata export
2023-05-30 11:38:02 +02:00
Kim Kulling 466f6960ac Merge branch 'gltf2_metadata_export' of https://github.com/C-Tech-Development-Corp/assimp into C-Tech-Development-Corp-gltf2_metadata_export 2023-05-30 08:14:49 +02:00
Kim Kulling 17c1a9125f
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-05-24 23:36:59 +02:00
Kim Kulling 0b53243b8f
Merge pull request #5083 from Jackie9527/msvc-clang-unused-function
Fix warning related to unused-function.
2023-05-24 23:36:01 +02:00
Kim Kulling f43cfa1fba
Merge branch 'master' into msvc-clang-unused-function 2023-05-24 23:23:40 +02:00
Kim Kulling 0f4667fce4
Merge pull request #5082 from skogler/fix-pbrt-exporter
Fix pbrt exporter coordinate system and FoV
2023-05-24 23:23:00 +02:00
Kim Kulling ca848c5b09
Merge branch 'master' into fix-pbrt-exporter 2023-05-24 22:28:32 +02:00
Kim Kulling 0794b41d55
Merge pull request #5087 from mwestphal/master
Fix librt link
2023-05-24 22:25:34 +02:00
Kim Kulling d73595b85d
Merge branch 'master' into master 2023-05-24 21:35:26 +02:00
mosfet80 e4621a3142
Update cpp-pm / hunter
Fix a lot of CVE vulnerabilities

Update abseil to LTFS 20220623.1 by @butteredmonkey in #656
Fix Hunter on Windows MSVC CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE 'ARM64EC' by @ccmvn in #659
openssl: update openssl to the latest 1.1.1t by @res0nance in #660
ceres-solver: per default disable CUDA support by @NeroBurner in #665
update range-v3 to version 0.12.0 by @alex-tdrn in #670
Update 'pybind11' to 2.10.4 by @hjmallon in #667
cli11: update cli11 to 2.3.2 by @res0nance in #669
openssl: update to v3 as 1.1.1 is almost eol by @res0nance in #668
Fix Hunter on Windows MSVC CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE 'ARM64' by @ccmvn in #655
Boost: Fix building b2 (+ headers) on Apple tvOS with Xcode generator by @hjmallon in #647
assimp: add version 5.2.5 by @NovaSurfer in #640
SuiteSparse: update to v1.6.1 (SuiteSparse v5.4.0), with METIS and OpenBLAS by @NeroBurner in #642
OpenSSL: replace HUNTER_UWP_PLATFORM with CMAKE_SYSTEM_NAME check by @Dargun in #635
asio-grpc: Add version 2.3.0 by @Tradias in #636
Update OpenBLAS to v0.3.21 and add new BUILD_WITHOUT_LAPACK flag by @NeroBurner in #638
OpenBLAS: starting with 0.3.21 build with LAPACK support per default by @NeroBurner in #639
Update 'date' to v3.0.1 by @hjmallon in #615
Update 'SDL_net' package to v2.2.0-p0 by @drodin in #616
Update 'Jpeg' package to v9e-p0 by @drodin in #618
Update 'GTest' package to v1.12.1 by @drodin in #620
Update 'lcms' package to v2.13.1-p0 by @drodin in #621
Update 'giflib' package to v5.2.1-p0 by @drodin in #622
Update package 'WebP' to v1.2.4-p0 by @drodin in #623
Update 'Boost' to 1.80.0 by @tnixeu in #627
Update asio-grpc to 2.2.0 by @Tradias in #629
Update ZLIB to v1.2.13-p0 by @NeroBurner in #628
Add support for iOS simulator only builds by @hjmallon in #610
aws-sdk-cpp: Fix linking OpenSSL Crypto on Linux by @hjmallon in #630 and #631
OpenSSL: Fix build on universal windows platforms, add UWP job to global build matrix by @Dargun in #626
Update asio-grpc to v2.1.0 by @Tradias in #607
Update 'harfbuzz' package to v2.9.1-p0 by @drodin in #608
Update RocksDB to 7.5.3 by @twoentartian in #611
Fix CMAKE_IOS_INSTALL_COMBINED on Xcode 12+ by @hjmallon in #609
CI: Boost: update matrix.json to match general workflow by @NeroBurner in #612
Boost: update to v1.79.0 by @NeroBurner in #599
2023-05-24 17:29:29 +02:00
Samuel Kogler 0fbd2f5894
Merge branch 'master' into fix-pbrt-exporter 2023-05-24 15:24:46 +02:00
Kim Kulling 9f593d70b5
Merge pull request #4786 from Beilinson/refactor/KHR_material_specular
Removed KHR_materials_pbrSpecularGlossiness, added KHR_materials_specular
2023-05-23 12:44:47 +02:00
Kim Kulling b7a8c4ba75
Update glTF2Asset.inl 2023-05-23 10:33:14 +02:00
Kim Kulling 3a09fd0c85
Fix review finding
Test with glossiness disabled and enabled.
2023-05-23 09:50:20 +02:00
Kim Kulling e947471549
Merge branch 'master' into refactor/KHR_material_specular 2023-05-22 09:49:01 +02:00
Kim Kulling 0e06a5f945
Merge pull request #4806 from naota29/master
Updated DirectX Loader to assign appropriate material index in ConvertMaterials Function
2023-05-22 09:48:26 +02:00
Kim Kulling 03163a1dda
Merge branch 'master' into master 2023-05-21 18:26:56 +02:00
Kim Kulling 7e16d4046e
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization 2023-05-21 18:14:29 +02:00