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

879 Commits

Author SHA1 Message Date
Kim Kulling
331cb5ac72 Update M3DImporter.cpp 2022-01-18 22:23:01 +01:00
Kim Kulling
c3b91dd766 C4D. Fix merge conflicts 2022-01-18 22:21:58 +01:00
Kim Kulling
ea5996307a Update B3DImporter.cpp 2022-01-18 22:20:37 +01:00
Kim Kulling
efd1d36aa9 Merge branch 'master' into krishty-new-file-detection 2022-01-18 22:17:50 +01:00
Kim Kulling
959af1ac4d Revert change 2022-01-18 21:37:49 +01:00
Kim Kulling
7350baea93 Revert change 2022-01-18 21:36:55 +01:00
Kim Kulling
cf47411742 Revert change 2022-01-18 21:36:02 +01:00
Kim Kulling
1e80630d5d Revert change. 2022-01-18 21:35:09 +01:00
Kim Kulling
037732c429 Revert change 2022-01-18 21:34:18 +01:00
Kim Kulling
cff213d4dd Revert change 2022-01-18 21:33:05 +01:00
Kim Kulling
9d0006fecb Revert change 2022-01-18 21:32:06 +01:00
Kim Kulling
5af79cac1d Fix unittests + small refactorings 2022-01-18 21:23:43 +01:00
Jeremy Sigrist
59f28e168e Merge branch 'master' into jere9309/read_collada_materials 2022-01-18 09:55:33 -08:00
Kim Kulling
6e50b04ae0 Merge branch 'master' into IQM 2022-01-17 18:33:37 +01:00
Kim Kulling
f16e4fadc7 Merge branch 'master' into patch-1 2022-01-17 18:18:16 +01:00
Kim Kulling
cbde086bfb Merge branch 'krishty-new-file-detection' of https://github.com/assimp/assimp into krishty-new-file-detection 2022-01-16 20:58:07 +01:00
Kim Kulling
acd70b35a0 Fix merge issues 2022-01-16 20:57:56 +01:00
Kim Kulling
6ad7505376 Merge branch 'master' into krishty-new-file-detection 2022-01-16 20:43:57 +01:00
Kim Kulling
05746acb07 Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection 2022-01-16 20:41:24 +01:00
Jeremy Sigrist
5aac72791d Merge branch 'master' into jere9309/read_collada_materials 2022-01-12 10:12:58 -08:00
Jeremy Sigrist
e671d087e1 Collada: Read all instance_material child nodes 2022-01-12 09:52:12 -08:00
Viktor Kovacs
c71f4bc95a Merge branch 'master' into common_base64 2022-01-11 18:46:08 +01:00
tanolino
f8abb015de Merge branch 'master' into patch-1 2022-01-11 09:55:19 +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
Kim Kulling
8cb5ab69b0 Merge branch 'master' into fix-bone-fit-check 2022-01-08 11:35:59 +01:00
Kim Kulling
776130534b Fix nullptr-dereferencing 
- Fix a possible nullptr-exception.
 2022-01-06 22:35:32 +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
tanolino
089fc7311a GCC might have an issue with value type Errors 2022-01-05 10:34:27 +01:00
tanolino
04d2d13172 Locale independent meter scale 
`XmlParser::getRealAttribute(...)` will call `strtod` (or `wcstod`) which are both locale dependent. So on a German locale system a scale of 0.01 meter will be parsed to 0. In order to avoid that I use the `fast_atoreal_move<ai_real>()` method.
 2022-01-05 10:10:38 +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
ab19cff328 Merge branch 'master' into pbr-obj 2021-12-31 08:33:30 +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
Vyacheslav Vanin
2da06dd41a Merge branch 'master' into fix-fbx-metalness-import 2021-12-26 17:31:33 +03:00
Garux
d11d2fc60d fix Inter-Quake Model (IQM) Importer MSVC warnings 2021-12-24 18:36:25 +03: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
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
Rene Sepulveda
19371af6e6 Support PBR properties/maps in Obj importer 2021-12-20 13:43:46 -05:00
Garux
46f618a6ef add Inter-Quake Model (IQM) Importer 2021-12-18 15:34:58 +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
Vyacheslav.Vanin
1afe7e6255 fix fbx import metalness 
Can't import metalness textures in fbx importer
 2021-12-16 12:09:06 +03:00
Kim Kulling
26dc168449 Merge branch 'master' into bugfix/import-crashes 2021-12-15 07:54:48 +01:00
Kim Kulling
cb657e4c13 Use correct XmlParser-methods and add some missing casts 2021-12-13 18:06:23 +01:00
Kim Kulling
54e60b031e Merge branch 'master' into master 2021-12-12 21:12:37 +01:00
Kim Kulling
33c6762272 Update HMPLoader.cpp 
- Fix possible division by zero
- closes https://github.com/assimp/assimp/issues/4235
 2021-12-10 14:32:45 +01:00