Kim Kulling
8134cae998
Merge pull request #4333 from assimp/kimkulling-prepare_v5.1.6
...
Update to 5.1.6
2022-01-09 23:45:44 +01:00
Kim Kulling
30f1583dde
Update utVersion.cpp
2022-01-09 21:06:05 +01:00
Kim Kulling
1d8667bfdc
Update to 5.1.6
2022-01-09 18:06:33 +01:00
Kim Kulling
cb3e846a19
Merge pull request #4318 from vpzomtrrfrt/fix-bone-fit-check
...
Fix bone fitted check in gltf2 exporter
2022-01-08 12:59:21 +01:00
Kim Kulling
8cb5ab69b0
Merge branch 'master' into fix-bone-fit-check
2022-01-08 11:35:59 +01:00
Kim Kulling
b40d9abdb9
Merge pull request #4328 from assimp/kimkulling-x3d_fix_nullptr_exception
...
Fix nullptr-dereferencing
2022-01-08 11:35:45 +01:00
Kim Kulling
776130534b
Fix nullptr-dereferencing
...
- Fix a possible nullptr-exception.
2022-01-06 22:35:32 +01:00
Kim Kulling
6a1f720f68
Merge pull request #4324 from alpire/master
...
Fix fuzzer crashes
2022-01-06 20:43:38 +01:00
Alex Rebert
b14b34d2b8
LWSLoader: Fix out of bounds iterator access
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38947
Fix #4222
2022-01-05 15:43:16 -05:00
Alex Rebert
310c81aaa2
Add support for spanned archives
...
Without it, assimp would crash on some inputs by jumping to a NULL
opendisk function. This commit adds an opendisk implementation, which
required adding a filename member to ZipFile.
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38873
Fix #4229
2022-01-05 15:43:10 -05:00
Alex Rebert
34d8fba100
Fix stack overflow in ZipArchiveIOSystem::MapArchive
...
The function allocates a filename buffer of 256, and copies the filename
extracted from the zip file into it. However, a filename might be larger
than 256 characters, in which case the function would write out of bounds.
This commit skips any file whose name is larger than 256 to avoid the
overflow.
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38870
Fix #4228
2022-01-05 10:01:46 -05:00
Kim Kulling
1d815fc23e
Merge pull request #4321 from assimp/kimkulling_update_morphing_method_doc_issue4320
...
Add link to used enum for a better understandability
2022-01-04 17:46:37 +01:00
Kim Kulling
a591944c04
Add link to used enum for a better understandability for the mesh morphing method.
2022-01-04 17:32:18 +01:00
Colin Reeder
87e9dbac40
Fix bone fitted check in gltf2 exporter
2022-01-03 16:32:34 -07:00
Kim Kulling
c2375a4ff0
Merge pull request #4272 from errissa/pbr-obj
...
Support PBR properties/maps in Obj importer
2021-12-31 10:38:50 +01:00
Kim Kulling
ab19cff328
Merge branch 'master' into pbr-obj
2021-12-31 08:33:30 +01:00
Kim Kulling
049a241855
Merge pull request #4314 from pseiderer/ps-devel-fix-namespace-001
...
RFC: BlenderScene: use explicit namespace instead of using namespace
2021-12-31 08:32:54 +01:00
Kim Kulling
a86ab45161
Merge branch 'master' into ps-devel-fix-namespace-001
2021-12-31 08:20:24 +01:00
Peter Seiderer
a099fe7cd3
BlenderScene: use explicit namespace instead of using namespace
...
Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320):
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-12-30 18:01:54 +01:00
Kim Kulling
85dd84cc78
Merge pull request #4259 from VyacheslavVanin/fix-fbx-metalness-import
...
fix fbx import metalness
2021-12-29 20:35:46 +01:00
Kim Kulling
0a5bd792de
Merge branch 'master' into fix-fbx-metalness-import
2021-12-29 19:08:16 +01:00
Kim Kulling
c882731688
Merge pull request #4311 from SirLynix/fix-mingw
...
CMake: Replace CMAKE_COMPILER_IS_MINGW by MINGW
2021-12-29 17:31:12 +01:00
JĂ©rĂ´me Leclercq
81fc50f612
CMake: Replace CMAKE_COMPILER_IS_MINGW by MINGW
...
See https://discourse.cmake.org/t/cmake-compiler-is-mingw-removed/4539 and https://cmake.org/cmake/help/latest/variable/MINGW.html
2021-12-28 15:58:37 +01:00
Vyacheslav Vanin
2da06dd41a
Merge branch 'master' into fix-fbx-metalness-import
2021-12-26 17:31:33 +03:00
Kim Kulling
54a8da1d55
Merge pull request #4293 from assimp/add_colsole_progresshandler_issue_963
...
Add console progresshandler
2021-12-26 11:38:24 +01:00
Kim Kulling
d44641398f
Add console progresshandler
2021-12-26 11:16:02 +01:00
Kim Kulling
4d7e817bd8
Merge pull request #4284 from assimp/kimkulling-skip_empty_embedded_textures_issue4238
...
MDL: Do not try to copy empty embedded texture
2021-12-23 13:03:43 +01:00
Kim Kulling
db2500c393
MDL: Do not try to copy empty embedded texture
...
- When an embedded texture is empty, skip it instead of trying to copy it. This must fail.
- closes https://github.com/assimp/assimp/issues/4238
- Found from the Google fuzzer.
2021-12-23 12:28:43 +01:00
Kim Kulling
64af16c427
Merge pull request #4283 from assimp/kimkulling-avoid_invalid_string_access_issue4222
...
LWS-Import: Avoid access to empty string token
2021-12-22 21:28:42 +01:00
Kim Kulling
635153b3a4
LWS-Import: Avoid access to empty string token
...
- Fix invalid access to string pointer when string token is empty
- closes https://github.com/assimp/assimp/issues/4222
2021-12-22 21:08:28 +01:00
Kim Kulling
7ec52e9e02
Merge pull request #4282 from assimp/kimkulling-fix_heap_overflow_during_utf8_issue4230
...
Make sure no overflow can happen
2021-12-22 20:56:39 +01:00
Kim Kulling
2c66d4d3a2
Optimize the check
2021-12-22 20:43:44 +01:00
Kim Kulling
215f4e1f4d
Fix typo
2021-12-22 20:02:29 +01:00
Kim Kulling
2eb86d75b8
Make sure no overflow can happen
...
- During UTF32 LE with BOM make sure that the byteswap operation will have enough space when iterating through the text buffer, which shall get encoded.
- closes https://github.com/assimp/assimp/issues/4230
2021-12-22 19:45:19 +01:00
Rene Sepulveda
19371af6e6
Support PBR properties/maps in Obj importer
2021-12-20 13:43:46 -05:00
Kim Kulling
80b0b897ed
Merge pull request #4266 from assimp/kimkulling-patch-1
...
Update version to 5.1.4
2021-12-18 21:42:19 +01:00
Kim Kulling
572e31ddcb
Update version to 5.1.4
2021-12-18 21:30:04 +01:00
Kim Kulling
9dfd401624
Merge pull request #4263 from RivIs-sssa01/fix_X3DImporter.cpp_closingBraces
...
Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define.
2021-12-18 21:28:32 +01:00
Kim Kulling
5a46597e47
Merge branch 'master' into fix_X3DImporter.cpp_closingBraces
2021-12-18 21:17:23 +01:00
Kim Kulling
01f68dd916
Merge pull request #4264 from Garux/IMAGE1.bmp_jpg
...
fix test/models/3DS/IMAGE1.bmp: is jpg
2021-12-18 21:16:59 +01:00
Garux
7fc4603579
fix test/models/3DS/IMAGE1.bmp: is jpg
2021-12-18 14:32:46 +03:00
sssaoi
d7bf8d6e07
Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define.
2021-12-18 14:50:22 +09:00
Vyacheslav Vanin
53968550e4
Merge branch 'master' into fix-fbx-metalness-import
2021-12-17 12:08:55 +03:00
Kim Kulling
6693e7e08c
Merge pull request #4256 from rumgot/cmake_no_known_features_error_fix
...
Fixed cmake error: No known features for C compiler when using the assimp library from another project
2021-12-16 21:35:52 +01:00
Kim Kulling
3e97329fa1
Merge branch 'master' into cmake_no_known_features_error_fix
2021-12-16 20:27:58 +01:00
Kim Kulling
c72e3905c2
Merge pull request #4261 from assimp/kimkulling-enable_language_support_issue4257-2
...
Enable C++11 and C99
2021-12-16 20:27:17 +01:00
Kim Kulling
2ffa0c59eb
Switch to C++11 until gtest gets an update.
2021-12-16 19:54:40 +01:00
Kim Kulling
af42d53c92
Enable C++17 and C99
...
- closes https://github.com/assimp/assimp/issues/4257
2021-12-16 19:41:15 +01:00
Kim Kulling
c4d858cf4d
Merge pull request #4260 from assimp/kimkulling-patch-1
...
Fix a typo in the Visual-Studio Dll-Versions
2021-12-16 15:39:01 +01:00
Kim Kulling
7a29147095
Fix a typo
2021-12-16 14:55:23 +01:00