Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,819 Commits 19 Branches 43 Tags
c8ab39dd04f49ca8d89cd6e9a96d46bea3c07ceb
Commit Graph

10819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viktor Kovacs
c8ab39dd04 Merge branch 'master' into common_base64 2022-01-15 23:42:56 +01:00
Kim Kulling
5976d54437 Merge pull request #4204 from TThulesen/so-unloading 
Allow dlclose of so library by avoiding unique symbols.
 2022-01-13 20:32:02 +01:00
Kim Kulling
d3e24196c0 Merge branch 'master' into so-unloading 2022-01-13 20:19:23 +01:00
Viktor Kovacs
c71f4bc95a Merge branch 'master' into common_base64 2022-01-11 18:46:08 +01:00
Kim Kulling
6a640a2de8 Merge pull request #4330 from danoli3/master 
Assimp Patch Android LTS NDK 23 Fix
 2022-01-11 10:30:40 +01:00
Kim Kulling
9d06bd4678 Merge branch 'master' into master 2022-01-11 10:13:22 +01:00
Kim Kulling
5dcaf445c3 Merge pull request #4337 from lopsided98/patch-1 
Fix imported target include directory
 2022-01-11 10:13:02 +01:00
Dan Rosser
e6cc187a7e Merge branch 'master' into master 2022-01-11 13:51:59 +11:00
Kim Kulling
d68224f2ed Merge branch 'master' into patch-1 2022-01-10 23:45:03 +01:00
Kim Kulling
a2c2b64877 Merge pull request #4335 from assimp/update_copyrights 
Update copyrights
 2022-01-10 21:53:59 +01:00
Kim Kulling
f63b10bf45 OpenGEX: Fix usage of texture specular token 2022-01-10 21:22:44 +01:00
Viktor Kovacs
6b9732721a Merge branch 'assimp:master' into common_base64 2022-01-10 21:15:31 +01:00
Kim Kulling
50c7301a38 Update copyrights 2022-01-10 21:13:43 +01:00
Dan Rosser
00bf74ad6d Merge branch 'master' into master 2022-01-10 14:04:24 +11:00
Ben Wolsieffer
629c8850ec Fix imported target include directory 
Fix the imported target include directory when the headers are not installed in '${CMAKE_INSTALL_PREFIX}/include'.
 2022-01-09 20:59:14 -05:00
Kim Kulling
8134cae998 Merge pull request #4333 from assimp/kimkulling-prepare_v5.1.6 
Update to 5.1.6
v5.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
Dan Rosser
9c4255b486 Assimp Android LTS NDK 23 Fix 2022-01-09 18:19:33 +11: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
kovacsv
125acf9ec8 Merge remote-tracking branch 'origin/master' into common_base64 2022-01-02 19:47:57 +01:00
kovacsv
bbe12240ca Move Base64 encode/decode functionality to the common folder. 2022-01-02 19:47:43 +01:00
Kim Kulling
c2375a4ff0 Merge pull request #4272 from errissa/pbr-obj 
Support PBR properties/maps in Obj importer
v5.1.5 		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