Kim Kulling
|
8ad2661e0c
|
Update CMakeLists.txt
|
2021-01-16 12:00:42 +01:00 |
Matt Pharr
|
17c79bcb94
|
Merge branch 'master' into tdb/pbrt3_exporter
|
2021-01-15 13:47:21 -08:00 |
RichardTea
|
7c9cddf786
|
Draco test file
2CylinderEngine from https://github.com/KhronosGroup/glTF-Sample-Models
|
2021-01-15 17:25:36 +00:00 |
|
Kim Kulling
|
6db343386b
|
remove install of zlibstatic
|
2021-01-15 16:46:15 +01:00 |
Maki
|
6d13fd6aa2
|
Fix glTF vertex colors with types other than float
|
2021-01-15 02:56:45 +00:00 |
|
Kim Kulling
|
8125e06f49
|
Merge branch 'master' into master
|
2021-01-14 19:03:16 +01:00 |
|
Kim Kulling
|
a9705e346a
|
Merge branch 'master' into ihsinme-patch-210
|
2021-01-14 17:21:44 +01:00 |
|
Kim Kulling
|
e3d39b9f66
|
Merge pull request #3583 from assimp/kimkulling-replace_sstrcasecmp
Remove dependency to posix-extension function
|
2021-01-14 12:06:24 +01:00 |
|
Kim Kulling
|
484ac21ef5
|
Remove dependency to posix-extension function
|
2021-01-14 11:53:25 +01:00 |
|
Kim Kulling
|
6d6a6ac11e
|
Merge pull request #3575 from ms-maxvollmer/gltf2_buffer_fixes
Fixes for GLTF2 buffers
|
2021-01-14 09:57:39 +01:00 |
|
Kim Kulling
|
87a6305cf0
|
Merge branch 'master' into gltf2_buffer_fixes
|
2021-01-12 18:32:17 +01:00 |
|
Kim Kulling
|
20873cb142
|
Merge pull request #3581 from assimp/build_fixes
Use const instead of constexpr
|
2021-01-12 18:31:53 +01:00 |
|
Matt Pharr
|
ff8d50c8d0
|
Fix MSVC compiler warnings
|
2021-01-12 08:23:53 -08:00 |
|
Matt Pharr
|
09c5564d5b
|
More compiler warnings
|
2021-01-12 08:16:08 -08:00 |
|
Matt Pharr
|
1fd8646b7a
|
Fix compiler warnings
|
2021-01-12 08:03:16 -08:00 |
ihsinme
|
070072370d
|
Update AMFImporter_Material.cpp
|
2021-01-12 15:43:40 +03:00 |
|
ihsinme
|
2e96366d04
|
Update AMFImporter_Geometry.cpp
|
2021-01-12 15:40:19 +03:00 |
kkulling
|
9174bca3f7
|
closes https://github.com/assimp/assimp/issues/3517: use const instead of constexpr
|
2021-01-12 10:01:53 +01:00 |
|
Matt Pharr
|
1042845414
|
Merge branch 'master' of https://github.com/assimp/assimp into tdb/pbrt3_exporter
|
2021-01-11 19:57:10 -08:00 |
|
Matt Pharr
|
71cfd8e0cf
|
Merge branch 'master' into tdb/pbrt3_exporter
|
2021-01-11 19:54:11 -08:00 |
|
Matt Pharr
|
2bc074e35a
|
Additional PBRT exporter cleanups
|
2021-01-11 19:42:23 -08:00 |
Kirill Gavrilov
|
0c2772e8bf
|
aiMaterial::GetTexture() - fix misleading description of path argument.
Mention aiScene::GetEmbeddedTexture() as a proper way to check if returned path
points to a file or to embedded texture.
|
2021-01-12 01:00:45 +03:00 |
Madrich
|
7999bc96e9
|
Merge pull request #17 from assimp/master
Update fork
|
2021-01-11 22:17:12 +01:00 |
Max Vollmer
|
d49aed4585
|
* Check that buffer view has buffer
* Handle integer overflow when calculating byte length
* Minor code cleanup for exception messages
|
2021-01-11 08:45:47 +00:00 |
|
Kim Kulling
|
ec08092dbf
|
Merge pull request #3571 from JacksonM8/issue_3570
Issue 3570 (CMake Policy violations on MSVC)
|
2021-01-09 08:41:28 +01:00 |
|
Matt Pharr
|
938537c884
|
Checkpoint improvements to pbrt exporter
|
2021-01-08 16:57:22 -08:00 |
|
Kim Kulling
|
68be7c77c0
|
Merge branch 'master' into issue_3570
|
2021-01-08 15:22:14 +01:00 |
|
Kim Kulling
|
1e81bed4d0
|
Merge pull request #3561 from ffontaine/master
contrib/zlib/CMakeLists.txt: don't install zlib
|
2021-01-07 11:05:37 +01:00 |
|
Kim Kulling
|
d898ecc80c
|
Fix another typo.
|
2021-01-06 18:59:13 +01:00 |
|
Kim Kulling
|
2ad4218d25
|
Merge branch 'master' into master
|
2021-01-06 18:54:57 +01:00 |
|
Kim Kulling
|
5222ab989f
|
Fix a typo
|
2021-01-06 18:51:59 +01:00 |
|
Kim Kulling
|
b23ecb4864
|
Update CMakeLists.txt
- Update minimum cmake version
- install for win32-platforms to avoid conflicts with targets for win32
|
2021-01-06 18:51:30 +01:00 |
JacksonM8
|
a01ef5374c
|
Merge branch 'master' into issue_3570
|
2021-01-07 01:47:06 +10:30 |
|
Kim Kulling
|
53c03fa364
|
Merge pull request #3569 from ihsinme/master
fix of an unattainable condition.
|
2021-01-06 16:00:46 +01:00 |
|
JacksonM8
|
3eed6fa006
|
Remove relative pathing in target_sources() as per CMP0076
|
2021-01-07 01:23:41 +10:30 |
|
JacksonM8
|
d0e57e2554
|
Remove quoted variable de-referencing as per CMP0054
|
2021-01-07 00:40:50 +10:30 |
|
ihsinme
|
e1052f421b
|
Update OpenDDLParser.cpp
|
2021-01-06 16:52:28 +03:00 |
|
ihsinme
|
177304bb7c
|
Update o3dgcArithmeticCodec.cpp
|
2021-01-06 16:50:07 +03:00 |
|
Kim Kulling
|
ccc0a50d96
|
Merge pull request #3558 from JLouis-B/3mf-improvements
3mf improvements
|
2021-01-02 13:29:58 +01:00 |
|
Kim Kulling
|
cf78781fa8
|
Merge branch 'master' into 3mf-improvements
|
2021-01-02 13:14:13 +01:00 |
|
Kim Kulling
|
43ea4d679b
|
Merge pull request #3556 from JLouis-B/update-unzip
Update unzip contrib
|
2021-01-02 13:13:20 +01:00 |
|
Kim Kulling
|
3298082a96
|
Merge branch 'master' into update-unzip
|
2021-01-02 12:06:53 +01:00 |
|
Kim Kulling
|
05da2123e1
|
Merge pull request #3552 from Danny-Kint/dev/gltf-KHR_materials
[gltf2] Add support for extensions KHR_materials
|
2021-01-02 12:06:12 +01:00 |
|
Kim Kulling
|
48b138ce13
|
Merge branch 'master' into dev/gltf-KHR_materials
|
2021-01-02 10:02:07 +01:00 |
|
Kim Kulling
|
89d4d6b68f
|
Merge pull request #3546 from wasd845/develop3
add operator* in aiQuaterniont
|
2021-01-02 00:50:53 +01:00 |
|
Kim Kulling
|
fa24e4199c
|
Merge branch 'master' into develop3
|
2021-01-02 00:13:47 +01:00 |
|
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 |