RichardTea
75e7d0f6ef
Merge branch 'master' into deprecated_gltfpbr_macros
2021-12-07 09:01:50 +00:00
Kim Kulling
70f5cca9c3
Merge pull request #4219 from assimp/kimkulling-v5.1.3
...
Update CMakeLists.txt
2021-12-04 21:01:52 +01:00
Kim Kulling
5b4829155c
Merge branch 'master' into so-unloading
2021-12-04 20:28:12 +01:00
Kim Kulling
983b20cda6
Update CMakeLists.txt
...
- tag v5.1.3
2021-12-04 20:26:29 +01:00
Kim Kulling
16149348ed
Merge pull request #4217 from umlaeute/bugfix/x3d-extension-check
...
Fix file-extension check for X3D-files
2021-12-01 16:07:12 +01:00
IOhannes m zmölnig
0e2ac2a91c
X3D: simplistic attempt to avoid crashes due to nullptr access
...
Related: https://github.com/assimp/assimp/issues/4201
while the crashes go away, i'm not sure whether this is the correct fix.
also, afaict the X3D importer produces wrong results anyhow
2021-12-01 12:21:29 +01:00
IOhannes m zmölnig
c8cdf3009e
X3D: replace 'here' debugging printout by an assertion.
...
if mNodeElementCur is NULL, we get a crash anyhow...
2021-12-01 12:19:19 +01:00
IOhannes m zmölnig
23d7811276
X3D: consistent initialization with nullptr
2021-12-01 11:35:06 +01:00
IOhannes m zmölnig
836963428e
Fix file-extension check for X3D-files
...
using the pre-existing and well-tested GetExtension() (which happens
to also normalize the extension), rather than attempting our own
buggy one...
Closes: https://github.com/assimp/assimp/issues/4177
2021-12-01 11:17:42 +01:00
Kim Kulling
8c9a148776
Merge pull request #4216 from inhosens/master
...
Interpolate euler rotations for quaternion animations
2021-12-01 00:24:15 +01:00
Kim Kulling
834ec20008
Merge branch 'master' into master
2021-11-30 23:44:42 +01:00
Kim Kulling
cc05b4c8f1
Merge pull request #4211 from ms-maxvollmer/ms-maxvollmer/crashfixes2
...
Added checks for out of bounds data access/writing
2021-11-30 23:44:00 +01:00
Kim Kulling
d6f3f292f2
Merge branch 'master' into ms-maxvollmer/crashfixes2
2021-11-30 23:17:59 +01:00
Inho Lee
4a37aa2ef8
Interpolate euler rotations for quaternion animations
...
FBX uses euler rotation but assimp library's base type is
quaternion. When assimp convert FBX some animation information
can be lost.
This patch interpolates euler-angle rotations and insert
additional keyframes for the FBX format.
2021-11-30 12:49:59 +01:00
Kim Kulling
745f5e7e65
Merge pull request #4193 from PencilAmazing/BlenderCollections
...
Update blender importer to work with Blender 2.8+ files
2021-11-28 23:51:06 +01:00
Pencil Amazing
095bd67e10
Fix memory leaks in CollectionObject by making ob a weak pointer and removing prev pointer.
...
Something was cyclic in CollectionObject and we don't traverse backwards anyways
2021-11-26 22:09:06 -04:00
Pencil Amazing
e831ecf3c2
Add a separate test case for Blender 276 and update Box.blend to be 293
2021-11-26 22:09:06 -04:00
Pencil Amazing
44fa1ec6a7
Make Blender importer aware of collections, and use them when available. Also add the default startup file for Blender 2.93
2021-11-26 22:09:06 -04:00
Kim Kulling
70c1aec7c7
Merge pull request #4212 from assimp/kimkulling-remove_deprecated_data
...
Delete test/models/3DS/UVTransformTest directory
2021-11-26 19:34:02 +01:00
Kim Kulling
34daf87428
Delete test/models/3DS/UVTransformTest directory
...
- Remove deprecated data
2021-11-26 19:17:42 +01:00
Max Vollmer (Microsoft Havok)
5e1188c44e
Check that positions exist before accessing them
2021-11-26 13:01:38 +00:00
Max Vollmer (Microsoft Havok)
0015823bef
Reject files with an invalid byteLength value
2021-11-26 13:01:15 +00:00
Max Vollmer (Microsoft Havok)
38382715f7
Ensure we don't access the vector with an out of bounds index
2021-11-26 13:01:00 +00:00
Kim Kulling
da8772c57b
Merge pull request #4207 from jakrams/msft-jakras-fix-corrupted-accessor
...
Prevent out-of-range memory writes by sparse accessors
2021-11-26 09:02:17 +01:00
Jan Krassnigg
1a5d66714f
Prevent out-of-range memory writes by sparse accessors
...
This turned up during fuzz testing. Corrupted data would make assimp write to random memory locations, leading to subsequent crashes.
2021-11-25 11:20:26 +01:00
Kim Kulling
690e558b88
Update IOSystem.cpp
2021-11-25 09:32:52 +01:00
Thomas Nicky Thulesen
8b78a63b50
Allow dlclose of so library by avoiding unique symbols.
2021-11-23 20:39:48 +01:00
RichardTea
d18709b899
Small float values should be true
2021-11-23 14:15:32 +00:00
RichardTea
5143044cc8
redefine AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS
...
This key is deprecated but is used by Qt5 & Qt 6.2.1 QtQuick3D
2021-11-23 13:55:27 +00:00
RichardTea
2fdf52488f
float and integer material property bool conversion
...
All reading float and integer material property values as bool
Zero => False
Non-Zero => True
2021-11-23 13:53:58 +00:00
RichardTea
42766af702
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-23 12:03:23 +00:00
Kim Kulling
889e559696
Merge pull request #4195 from ruyo/fix-gltf2-sparse-indicesType
...
Fixed an incorrect indeiciesType in the glTF2 sparse accessor.
2021-11-22 22:43:43 +01:00
Kim Kulling
b22098c234
Merge branch 'master' into fix-gltf2-sparse-indicesType
2021-11-22 22:02:05 +01:00
Kim Kulling
85ea57dcdb
Merge pull request #4196 from Rodousse/fix_mingw_compile_flags
...
Use adviced c++ flag to supress warning on mingw
2021-11-22 22:01:05 +01:00
Robin Dousse
6819b84b8b
Use adviced c++ flag to supress warning on mingw
2021-11-22 09:27:14 +01:00
ruyo
60bfde78eb
Fixed an incorrect indeiciesType in the glTF2 sparse accessor.
2021-11-21 23:23:22 +09:00
Kim Kulling
bf1f142a72
Fix warnings
2021-11-20 18:40:38 +01:00
Kim Kulling
aeba7a43a0
Merge pull request #4185 from rhabacker/win_dll_so_version
...
On Windows/mingw in shared build mode append '-SOVERSION' to DLL base file name
2021-11-20 16:53:21 +01:00
Kim Kulling
9ebd74bd26
Merge branch 'master' into win_dll_so_version
2021-11-20 14:16:32 +01:00
Kim Kulling
9267f4c5b8
Merge pull request #4184 from RichardTea/deprecated_gltfpbr_macros
...
Redefine deprecated glTF-specific PBR material macros
2021-11-20 14:01:57 +01:00
Kim Kulling
0d857bcf9f
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-20 12:35:56 +01:00
Ralf Habacker
2ceb18746b
Append '-SOVERSION' to DLL base file name for mingw builds to match common style
2021-11-18 08:17:31 +01:00
Kim Kulling
3db1592f7e
Merge pull request #4187 from RichardTea/collada_value_not_attrib_4179
...
Collada: Read value, not attribute
2021-11-17 19:16:10 +01:00
RichardTea
74b3be194d
Read the Value, not the Attribute
...
Correct some mistakes made when moving to pugixml from IrrXML
Fixes #4179
2021-11-17 17:10:10 +00:00
RichardTea
bab8b8dbab
apply clangformat
2021-11-17 17:08:19 +00:00
RichardTea
33845cd019
Only issue compile warning on gcc and msvc
...
I'm not sure on the proper syntax for clang and mingw
2021-11-17 15:44:16 +00:00
Kim Kulling
b1c83f437f
Merge pull request #4173 from jdumas/jdumas/ziplib
...
Do not build ziplib when 3MF exporter is disabled.
2021-11-17 14:09:07 +01:00
Kim Kulling
ce3101ea4e
Merge branch 'master' into jdumas/ziplib
2021-11-17 13:46:16 +01:00
RichardTea
c24f99cd0e
Redefine deprecated glTF-specific PBR material macros
...
Intended to support Qt5 QtQuick3D until it is ported to generic PBR
macros.
2021-11-16 11:42:59 +00:00
Kim Kulling
c174575cf8
Merge pull request #4181 from assimp/kimkulling-prepare_installer
...
Update script_x64.iss
2021-11-15 11:05:34 +01:00