59f28e168e
Merge branch 'master' into jere9309/read_collada_materials
2022-01-18 09:55:33 -08:00
3cca102531
Merge pull request #4265 from Garux/IQM
...
add Inter-Quake Model (IQM) Importer
2022-01-17 21:43:33 +01:00
6e50b04ae0
Merge branch 'master' into IQM
2022-01-17 18:33:37 +01:00
f21ff66505
Merge pull request #4323 from tanolino/patch-1
...
Locale independent meter scale
2022-01-17 18:32:24 +01:00
f16e4fadc7
Merge branch 'master' into patch-1
2022-01-17 18:18:16 +01:00
415b0e19d9
Changes for gcc compatibility
2022-01-17 16:39:50 +00:00
65f2353105
IFC Reading: Fix opening reading.
2022-01-17 15:49:11 +00:00
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
acd70b35a0
Fix merge issues
2022-01-16 20:57:56 +01:00
6ad7505376
Merge branch 'master' into krishty-new-file-detection
2022-01-16 20:43:57 +01:00
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
db162939b2
Merge branch 'master' into respect-cmake-output-variables
2022-01-16 16:19:03 +01:00
41cfcc7d16
Merge pull request #4336 from kovacsv/common_base64
...
Move Base64 encode/decode functionality to the common folder
2022-01-16 14:44:54 +01:00
f8253c3e3c
Update Base64.hpp
2022-01-16 13:21:01 +01:00
7eec3f0d8f
Update copyrights.
2022-01-16 13:19:25 +01:00
c8ab39dd04
Merge branch 'master' into common_base64
2022-01-15 23:42:56 +01:00
fe40ddf9a9
Merge branch 'master' into respect-cmake-output-variables
2022-01-14 16:45:27 +01:00
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
d3e24196c0
Merge branch 'master' into so-unloading
2022-01-13 20:19:23 +01:00
5aac72791d
Merge branch 'master' into jere9309/read_collada_materials
2022-01-12 10:12:58 -08:00
e671d087e1
Collada: Read all instance_material child nodes
2022-01-12 09:52:12 -08:00
8a7576b85c
Check for variable definition rather than empty string
2022-01-12 15:04:41 +01:00
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
7f2ab47b5a
Respect top-level CMAKE_*_OUTPUT_DIRECTORY variables
2022-01-11 18:36:05 +01:00
6a640a2de8
Merge pull request #4330 from danoli3/master
...
Assimp Patch Android LTS NDK 23 Fix
2022-01-11 10:30:40 +01:00
9d06bd4678
Merge branch 'master' into master
2022-01-11 10:13:22 +01:00
5dcaf445c3
Merge pull request #4337 from lopsided98/patch-1
...
Fix imported target include directory
2022-01-11 10:13:02 +01:00
f8abb015de
Merge branch 'master' into patch-1
2022-01-11 09:55:19 +01:00
e6cc187a7e
Merge branch 'master' into master
2022-01-11 13:51:59 +11:00
d68224f2ed
Merge branch 'master' into patch-1
2022-01-10 23:45:03 +01:00
a2c2b64877
Merge pull request #4335 from assimp/update_copyrights
...
Update copyrights
2022-01-10 21:53:59 +01:00
f63b10bf45
OpenGEX: Fix usage of texture specular token
2022-01-10 21:22:44 +01:00
6b9732721a
Merge branch 'assimp:master' into common_base64
2022-01-10 21:15:31 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
00bf74ad6d
Merge branch 'master' into master
2022-01-10 14:04:24 +11:00
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
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
30f1583dde
Update utVersion.cpp
2022-01-09 21:06:05 +01:00
1d8667bfdc
Update to 5.1.6
2022-01-09 18:06:33 +01:00
9c4255b486
Assimp Android LTS NDK 23 Fix
2022-01-09 18:19:33 +11:00
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
8cb5ab69b0
Merge branch 'master' into fix-bone-fit-check
2022-01-08 11:35:59 +01:00
b40d9abdb9
Merge pull request #4328 from assimp/kimkulling-x3d_fix_nullptr_exception
...
Fix nullptr-dereferencing
2022-01-08 11:35:45 +01:00
776130534b
Fix nullptr-dereferencing
...
- Fix a possible nullptr-exception.
2022-01-06 22:35:32 +01:00
6a1f720f68
Merge pull request #4324 from alpire/master
...
Fix fuzzer crashes
2022-01-06 20:43:38 +01:00
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
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
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
089fc7311a
GCC might have an issue with value type Errors
2022-01-05 10:34:27 +01:00
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
Jeremy Sigrist
Kim Kulling
Ben Sewell
Kim Kulling
Léon
Viktor Kovacs
Jeremy Sigrist
Léon
tanolino
Dan Rosser
Ben Wolsieffer
Alex Rebert