48b138ce13
Merge branch 'master' into dev/gltf-KHR_materials
2021-01-02 10:02:07 +01:00
89d4d6b68f
Merge pull request #3546 from wasd845/develop3
...
add operator* in aiQuaterniont
2021-01-02 00:50:53 +01:00
fa24e4199c
Merge branch 'master' into develop3
2021-01-02 00:13:47 +01:00
18ad1510f7
Merge pull request #3543 from gris-martin/patch-1
...
Only consider continuation tokens at end of line
2021-01-02 00:12:57 +01:00
0a1535647a
Merge branch 'master' into patch-1
2021-01-02 00:01:25 +01:00
07aace0fdd
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-31 07:08:31 +01:00
88e5f3416e
Merge pull request #3562 from makitsune/fix-gltf-bin-from-memory
...
Fix glTF from memory loading .bin with a custom IOHandler
2020-12-30 11:50:35 +01:00
e0803b3ec2
Merge branch 'master' into fix-gltf-bin-from-memory
2020-12-30 11:17:31 +01:00
b8d947299a
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-29 17:09:15 +01:00
3ccfc03c48
Merge pull request #3542 from ms-maxvollmer/fbx_tokenizer_fix
...
FBXBinaryTokenizer: Check length of property
2020-12-28 20:19:35 +01:00
3e320100e5
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-28 10:29:17 +01:00
07b59f539d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-28 08:48:54 +01:00
ca653e0c6a
Fix glTF from memory loading .bin with a custom IOHandler
2020-12-28 07:18:50 +00:00
77f9c2854a
Merge branch 'master' into fbx_tokenizer_fix
2020-12-25 21:44:26 +01:00
404bedd8be
Merge pull request #3541 from ms-maxvollmer/gltf2_fixes
...
GLTF2 fixes
2020-12-25 19:22:53 +01:00
7bb4b3fb03
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-25 16:19:07 +01:00
3f5238d7c1
Merge branch 'master' into gltf2_fixes
2020-12-24 16:48:36 +01:00
2013932e7a
Merge pull request #3555 from someonewithpc/master
...
Fix #3222
2020-12-24 16:48:08 +01:00
2873d862b0
Update CMakeLists.txt
2020-12-23 15:44:37 +00:00
dbffe25c9d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-23 11:33:04 +01:00
383c97e380
Add KHR_materials_transmission during export
2020-12-23 10:43:21 +01:00
2b097c1e73
Add KHR_materials_transmission during import
2020-12-23 10:43:01 +01:00
197bf1e617
Add KHR_materials_clearcoat during export
2020-12-23 09:56:15 +01:00
f8c63d874b
support KHR_materials_clearcoat during import
2020-12-23 08:12:09 +01:00
102d380711
Merge pull request #3540 from wasd845/master
...
_dest may be destructed twice if _dest is not null in MergeScenes()
2020-12-22 12:07:01 +01:00
b4b011e764
Merge branch 'master' into master
2020-12-22 11:11:45 +01:00
ed2b680f46
Merge pull request #3533 from Biswa96/fix-casting-mingw
...
Common: Fix GCC error invalid conversion in MINGW.
2020-12-21 20:04:27 +01:00
50f9fb28b6
Merge branch 'master' into fix-casting-mingw
2020-12-21 18:29:18 +01:00
aa9d6ce7b7
add support for khr_materials_sheen during export
2020-12-21 14:34:16 +01:00
0fdda99ea1
add underscore (MATERIAL_SHEEN instead of MATERIALSHEEN)
2020-12-21 14:33:35 +01:00
947d72d281
Merge branch 'master' into patch-1
2020-12-21 09:53:22 +01:00
5f5f1cf7a0
Merge pull request #3531 from JLouis-B/gltf2-exporter-crash
...
Fixed a crash of the Gltf 2 exporter in the case of an animation without scale animation key.
2020-12-20 21:57:44 +01:00
63b0a97369
import KHR_materials_sheen
2020-12-20 07:59:12 +01:00
981923821a
Merge branch 'master' into gltf2-exporter-crash
2020-12-18 16:27:06 +01:00
6003be382c
Merge branch 'master' into patch-1
2020-12-17 14:29:51 +01:00
b75ea77365
Merge branch 'develop3' of https://github.com/wasd845/assimp into develop3
2020-12-17 17:09:20 +08:00
15cff94926
add operator* in aiQuaterniont
2020-12-17 17:08:06 +08:00
2250462853
Merge branch 'master' into develop3
2020-12-17 16:18:35 +08:00
b6f8448b78
add operator* in aiQuaterniont
2020-12-17 16:13:35 +08:00
f6dd11ca1a
add operator* in aiQuaterniont
2020-12-17 15:07:03 +08:00
b3e1ee3ca0
Merge pull request #3524 from inhosens/master
...
FBXConverter : Fix timescales of FBX animations
2020-12-16 22:33:16 +01:00
4e5b25cd81
Keep AnimMesh data during the SortByPTypeProcess
...
A Postprocessing step, SortByPTypeProcess, can rebuild Mesh data,
but it does not handle AnimMesh.
This patch helps to rebuild appropriate AnimMeshes for the Mesh.
2020-12-16 19:19:30 +01:00
b8bf1eac04
FBXConverter : Fix timescales of FBX animations
...
FBX animations were recorded by framenumber, not by time.
This patch will change it as a base of milliseconds.
2020-12-16 15:02:46 +01:00
8003a016c2
Add some spaces to format code consistently
2020-12-15 12:36:00 +01:00
3718980c09
Only consider continuation tokens at end of line
2020-12-15 12:16:22 +01:00
a15adc9fbc
Fixed copypaste error
2020-12-14 17:01:42 +00:00
9d3c0081eb
Throw if property length is out of bounds
2020-12-14 16:49:04 +00:00
1db51503d8
Throw instead of assert on invalid file input
2020-12-14 16:44:56 +00:00
5436e16802
* Fix memory leak in GLTF2 Importer that occurs when an exception gets thrown while constructing a scene
...
* Fix crash in GLTF2 Importer when a scene with dangling/uninitialized pointers gets deleted after an exception was thrown
* Fix crash in GLTF2 Importer when channel sampler is not set (negative index)
2020-12-14 16:37:02 +00:00
0e939cc450
Merge pull request #1 from assimp/master
...
Merge main into fork
2020-12-14 16:12:45 +00:00
Kim Kulling
Danny-Kint
Danny-Kint
Maki
Hugo Sales
Danny Kabrane
Martin
cywang
wasd845
Inho Lee
Max Vollmer
Max Vollmer (Microsoft Havok)