Kim Kulling
|
c12f747bde
|
Merge branch 'master' into kimkulling-funding_update
|
2021-01-26 18:25:07 +01:00 |
|
Kim Kulling
|
b6b061b21a
|
Merge pull request #3610 from assimp/kimkulling-remove_appveyor
Delete appveyor.yml
|
2021-01-26 18:24:47 +01:00 |
RichardTea
|
fe97ff6474
|
Draco platform libraries have different names
On Windows it's draco.dll/lib
On Linux/macOS draco_shared.dylib & draco_static.lib
|
2021-01-26 17:19:41 +00:00 |
|
Kim Kulling
|
95fe3e98a6
|
Merge branch 'master' into kimkulling-remove_appveyor
|
2021-01-26 18:09:43 +01:00 |
|
Kim Kulling
|
0244aec0a5
|
Update Readme.md
|
2021-01-26 18:09:25 +01:00 |
|
Kim Kulling
|
d04b1b9e2e
|
Replace patreon by opencollective
|
2021-01-26 18:08:20 +01:00 |
|
RichardTea
|
c917e6513f
|
Merge branch 'master' into issue_2195_draco
|
2021-01-26 16:43:46 +00:00 |
|
RichardTea
|
f39ba8ddb2
|
Add compile error for bad error draco config
KHR_draco_mesh_compression requires
DRACO_MESH_COMPRESSION_SUPPORTED
|
2021-01-26 16:24:18 +00:00 |
|
RichardTea
|
dde7605158
|
Implement draco decoding
|
2021-01-26 16:08:12 +00:00 |
|
RichardTea
|
3a7d0f5656
|
Add Draco to cmakelists
Initial pass. Not yet used.
Add Draco library to assimp build and link
|
2021-01-26 15:58:14 +00:00 |
contriteobserver
|
d7bf513250
|
renaming iterator to avoid any possibility of scop collisions
|
2021-01-26 01:36:12 -08:00 |
|
contriteobserver
|
69fc809307
|
size_t is not the same as unsigned int on some systems
|
2021-01-26 01:01:59 -08:00 |
|
contriteobserver
|
f92a34e0b7
|
Merge branch 'master' into ColladaSubmeshFix
|
2021-01-26 00:38:37 -08:00 |
|
Kim Kulling
|
4017a6da26
|
Merge branch 'master' into issue_3573
|
2021-01-25 20:48:31 +01:00 |
xiaohunqupo
|
fbc45fecec
|
Merge pull request #1 from assimp/master
Merge From assimp/assimp master
|
2021-01-25 14:12:28 +08:00 |
|
Kim Kulling
|
294d4230b0
|
Merge pull request #3612 from assimp/kimkulling-issue_3601
Add missing skip
|
2021-01-24 18:59:03 +01:00 |
|
Kim Kulling
|
243d017463
|
Add missing skip
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
|
2021-01-24 18:47:50 +01:00 |
|
Kim Kulling
|
47dd6c0786
|
Merge pull request #3611 from assimp/kimkulling-issue_3599
Fix typo in collada parser
|
2021-01-24 18:37:16 +01:00 |
|
Kim Kulling
|
a2b889ab09
|
Fix typo in collada parser
closes https://github.com/assimp/assimp/issues/3599
|
2021-01-24 18:21:46 +01:00 |
|
Kim Kulling
|
e18261953d
|
Delete mtime_cache
|
2021-01-24 18:14:43 +01:00 |
|
Kim Kulling
|
7a706be920
|
Delete cacheglobs.txt
|
2021-01-24 18:14:36 +01:00 |
|
Kim Kulling
|
dd0facd722
|
Delete appveyor.yml
|
2021-01-24 18:14:00 +01:00 |
|
contriteobserver
|
b48e19c28f
|
Merge branch 'master' into ColladaSubmeshFix
|
2021-01-24 02:30:31 -08:00 |
Ville Voutilainen
|
ec141a94c3
|
Merge branch 'master' into master
|
2021-01-24 11:22:24 +02:00 |
|
Kim Kulling
|
9dc95be939
|
Merge pull request #3596 from RichardTea/vs_gitignore_update
Update gitignore for default VS2019 behaviour
|
2021-01-24 10:07:08 +01:00 |
|
Ville Voutilainen
|
6ebae5e67c
|
GCC 11 build fixes
|
2021-01-24 11:04:46 +02:00 |
|
Kim Kulling
|
5390e035d5
|
Merge branch 'master' into vs_gitignore_update
|
2021-01-24 09:47:12 +01:00 |
|
contriteobserver
|
338abded12
|
ColladaLoader now assigns individual materials to submeshes as needed
Optional assignment of individual materials to submeshes, addresses #3606
|
2021-01-23 02:20:58 -08:00 |
Bart Sekura
|
5f50e42535
|
added missing return
|
2021-01-23 09:56:35 +09:00 |
|
Bart Sekura
|
f8c512acd7
|
changed morph anim error to warning when validating
|
2021-01-23 09:52:46 +09:00 |
thomasbiang
|
91dc904ed1
|
Merge branch 'master' into master
|
2021-01-22 13:25:31 -08:00 |
|
Kim Kulling
|
28c9bccbef
|
Merge pull request #3603 from assimp/kimkulling-remove_redundancy
Remove redundant statement in if
|
2021-01-22 14:36:59 +01:00 |
|
Kim Kulling
|
e792455d66
|
Remove redundant statement in if
- closes https://github.com/assimp/assimp/issues/3180
|
2021-01-22 14:22:34 +01:00 |
|
Kim Kulling
|
e321367dae
|
Merge pull request #3602 from assimp/kimkulling-issue3151
Update 3DSLoader.cpp
|
2021-01-22 14:18:20 +01:00 |
|
Kim Kulling
|
dc4514de82
|
Update COBLoader.cpp
Fix cppcheck finding
|
2021-01-22 13:23:39 +01:00 |
|
Kim Kulling
|
0dcd72d420
|
Update IFCOpenings.cpp
|
2021-01-22 13:18:43 +01:00 |
|
Kim Kulling
|
f44572157a
|
Update 3DSLoader.cpp
|
2021-01-22 13:14:59 +01:00 |
|
Kim Kulling
|
6293c22c5c
|
Merge branch 'master' into vs_gitignore_update
|
2021-01-22 12:59:42 +01:00 |
|
Kim Kulling
|
c9c54822fd
|
Merge pull request #3594 from xiaohunqupo/master
Fix STL Expoter error.
|
2021-01-22 12:59:18 +01:00 |
|
Kim Kulling
|
f2d3f0dbe6
|
Merge branch 'master' into master
|
2021-01-22 12:35:44 +01:00 |
|
Kim Kulling
|
71e8c1001e
|
Merge pull request #3582 from makitsune/fix-gltf-vertex-colors
Fix glTF vertex colors with types other than float
|
2021-01-22 09:51:37 +01:00 |
|
Kim Kulling
|
e435a43e53
|
Merge branch 'master' into fix-gltf-vertex-colors
|
2021-01-22 08:04:04 +01:00 |
|
Kim Kulling
|
b64f1c40f4
|
Merge pull request #3600 from assimp/kimkulling-doc
Update Build.md
|
2021-01-22 07:59:18 +01:00 |
|
thomasbiang
|
b3a35364ad
|
Merge branch 'master' into master
|
2021-01-21 13:38:21 -08:00 |
|
Kim Kulling
|
345726f5c8
|
Update Build.md
|
2021-01-21 20:56:21 +01:00 |
|
Kim Kulling
|
2bcf08370d
|
Merge branch 'master' into fix-gltf-vertex-colors
|
2021-01-21 11:54:02 +01:00 |
|
Kim Kulling
|
5e21b9f72d
|
Merge pull request #3580 from mmp/tdb/pbrt3_exporter
pbrt-v4 exporter
|
2021-01-21 11:48:19 +01:00 |
|
Kim Kulling
|
0b9cbb53ab
|
Merge branch 'master' into tdb/pbrt3_exporter
|
2021-01-21 11:27:35 +01:00 |
|
Kim Kulling
|
fabea8ccd0
|
Merge pull request #3587 from assimp/build_fixes
Win32-refactorings
|
2021-01-21 11:26:45 +01:00 |
|
Kim Kulling
|
7dcac538f8
|
Merge branch 'master' into build_fixes
|
2021-01-21 09:03:06 +01:00 |