Kim Kulling
|
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 |
|
Kim Kulling
|
0a1535647a
|
Merge branch 'master' into patch-1
|
2021-01-02 00:01:25 +01:00 |
Danny-Kint
|
07aace0fdd
|
Merge branch 'master' into dev/gltf-KHR_materials
|
2020-12-31 07:08:31 +01:00 |
|
Kim Kulling
|
465220b26a
|
Merge branch 'master' into 3mf-improvements
|
2020-12-30 18:12:26 +01:00 |
|
Kim Kulling
|
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 |
|
Kim Kulling
|
e0803b3ec2
|
Merge branch 'master' into fix-gltf-bin-from-memory
|
2020-12-30 11:17:31 +01:00 |
|
Danny-Kint
|
b8d947299a
|
Merge branch 'master' into dev/gltf-KHR_materials
|
2020-12-29 17:09:15 +01:00 |
Jean-Louis
|
37df38f951
|
[3MF] Improves node naming
|
2020-12-29 15:46:28 +01:00 |
|
Kim Kulling
|
3ccfc03c48
|
Merge pull request #3542 from ms-maxvollmer/fbx_tokenizer_fix
FBXBinaryTokenizer: Check length of property
|
2020-12-28 20:19:35 +01:00 |
|
Jean-Louis
|
4025c57fd0
|
[3MF] Parse the transform of the components
|
2020-12-28 15:47:20 +01:00 |
|
Jean-Louis
|
eda967bd02
|
Parse the <build> node + refactoring
|
2020-12-28 12:31:54 +01:00 |
|
Danny-Kint
|
3e320100e5
|
Merge branch 'master' into dev/gltf-KHR_materials
|
2020-12-28 10:29:17 +01:00 |
Danny-Kint
|
07b59f539d
|
Merge branch 'master' into dev/gltf-KHR_materials
|
2020-12-28 08:48:54 +01:00 |
Maki
|
ca653e0c6a
|
Fix glTF from memory loading .bin with a custom IOHandler
|
2020-12-28 07:18:50 +00:00 |
|
Jean-Louis
|
629147043e
|
XmlParser: Fixed an error message when the file was correctly parsed
|
2020-12-27 18:13:49 +01:00 |
Fabrice Fontaine
|
bfe35fc06b
|
contrib/zlib/CMakeLists.txt: don't install zlib
Don't install zlib static library to avoid potential conflicts with a
system-wide zlib package
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
2020-12-27 15:27:41 +01:00 |
|
Jean-Louis
|
eed75aaf2c
|
Remove debug print
|
2020-12-26 14:57:52 +01:00 |
|
Jean-Louis
|
0ec8d6e285
|
[3MF] Missing file in previous commit + parse object material in the importer
|
2020-12-26 14:04:45 +01:00 |
|
Jean-Louis
|
0952038461
|
Small refactoring on 3MF export
|
2020-12-26 03:02:18 +01:00 |
|
Jean-Louis
|
c10d592b79
|
Fix material parsing in the 3MF importer
|
2020-12-26 02:36:24 +01:00 |
|
Kim Kulling
|
77f9c2854a
|
Merge branch 'master' into fbx_tokenizer_fix
|
2020-12-25 21:44:26 +01:00 |
|
Kim Kulling
|
404bedd8be
|
Merge pull request #3541 from ms-maxvollmer/gltf2_fixes
GLTF2 fixes
|
2020-12-25 19:22:53 +01:00 |
|
Danny-Kint
|
7bb4b3fb03
|
Merge branch 'master' into dev/gltf-KHR_materials
|
2020-12-25 16:19:07 +01:00 |
|
Kim Kulling
|
3f5238d7c1
|
Merge branch 'master' into gltf2_fixes
|
2020-12-24 16:48:36 +01:00 |
|
Kim Kulling
|
2013932e7a
|
Merge pull request #3555 from someonewithpc/master
Fix #3222
|
2020-12-24 16:48:08 +01:00 |
|
Jean-Louis
|
effe52368c
|
No need to allocate a full size buffer for small files
|
2020-12-24 12:18:07 +01:00 |
|
Jean-Louis
|
895137c7d7
|
Fix unzip max buffer length error
|
2020-12-24 11:39:59 +01:00 |
|
Jean-Louis
|
c464d01778
|
Fix fopen64, ftello64, fseeko64 declarations on all platforms
|
2020-12-24 03:18:09 +01:00 |
|
Jean-Louis
|
54be7ac582
|
Update unzip contrib
|
2020-12-24 01:53:40 +01:00 |
Hugo Sales
|
2873d862b0
|
Update CMakeLists.txt
|
2020-12-23 15:44:37 +00:00 |
|
Danny-Kint
|
dbffe25c9d
|
Merge branch 'master' into dev/gltf-KHR_materials
|
2020-12-23 11:33:04 +01:00 |
Danny Kabrane
|
383c97e380
|
Add KHR_materials_transmission during export
|
2020-12-23 10:43:21 +01:00 |
|
Danny Kabrane
|
2b097c1e73
|
Add KHR_materials_transmission during import
|
2020-12-23 10:43:01 +01:00 |
|
Danny Kabrane
|
197bf1e617
|
Add KHR_materials_clearcoat during export
|
2020-12-23 09:56:15 +01:00 |
|
Danny Kabrane
|
f8c63d874b
|
support KHR_materials_clearcoat during import
|
2020-12-23 08:12:09 +01:00 |
|
Kim Kulling
|
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 |
|
Kim Kulling
|
b4b011e764
|
Merge branch 'master' into master
|
2020-12-22 11:11:45 +01:00 |
|
Kim Kulling
|
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 |
|
Kim Kulling
|
50f9fb28b6
|
Merge branch 'master' into fix-casting-mingw
|
2020-12-21 18:29:18 +01:00 |
|
Danny Kabrane
|
aa9d6ce7b7
|
add support for khr_materials_sheen during export
|
2020-12-21 14:34:16 +01:00 |
|
Danny Kabrane
|
0fdda99ea1
|
add underscore (MATERIAL_SHEEN instead of MATERIALSHEEN)
|
2020-12-21 14:33:35 +01:00 |
Martin
|
947d72d281
|
Merge branch 'master' into patch-1
|
2020-12-21 09:53:22 +01:00 |
|
Kim Kulling
|
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 |
|
Danny Kabrane
|
63b0a97369
|
import KHR_materials_sheen
|
2020-12-20 07:59:12 +01:00 |
|
Kim Kulling
|
981923821a
|
Merge branch 'master' into gltf2-exporter-crash
|
2020-12-18 16:27:06 +01:00 |
|
Martin
|
6003be382c
|
Merge branch 'master' into patch-1
|
2020-12-17 14:29:51 +01:00 |
cywang
|
b75ea77365
|
Merge branch 'develop3' of https://github.com/wasd845/assimp into develop3
|
2020-12-17 17:09:20 +08:00 |
|
cywang
|
15cff94926
|
add operator* in aiQuaterniont
|
2020-12-17 17:08:06 +08:00 |
wasd845
|
2250462853
|
Merge branch 'master' into develop3
|
2020-12-17 16:18:35 +08:00 |
|
cywang
|
b6f8448b78
|
add operator* in aiQuaterniont
|
2020-12-17 16:13:35 +08:00 |