Kim Kulling
|
e7ed315145
|
Merge pull request #2801 from RichardTea/fix-2799-2785
MSVC: Disable optimisations in debug build
|
2019-12-07 19:34:54 +01:00 |
|
Kim Kulling
|
f9e861527b
|
Merge branch 'master' into fix-2799-2785
|
2019-12-07 13:47:25 +01:00 |
|
Kim Kulling
|
016115628e
|
Merge pull request #2810 from MalcolmTyrrell/ModellerMetaData
Modeller meta data
|
2019-12-07 13:40:21 +01:00 |
|
Kim Kulling
|
9f3c26dbd8
|
Update Importer.cpp
fix typo
|
2019-12-07 09:18:45 +01:00 |
|
Kim Kulling
|
7648c438ca
|
Update Importer.cpp
fix more typos.
|
2019-12-07 09:08:15 +01:00 |
|
Kim Kulling
|
26f6e5ad30
|
Update Importer.cpp
fix typo
|
2019-12-07 08:58:47 +01:00 |
|
Kim Kulling
|
ef13fb2ddd
|
Update Importer.cpp
Fix minor review findings.
|
2019-12-06 21:38:07 +01:00 |
|
Kim Kulling
|
c1706d9bf8
|
Update metadata.h
Fix possible crashes.
|
2019-12-06 21:24:04 +01:00 |
|
Kim Kulling
|
b2ab3fa35e
|
Merge branch 'master' into ModellerMetaData
|
2019-12-06 21:19:29 +01:00 |
Gordon MacPherson
|
6d71921a2f
|
Merge pull request #2802 from RichardTea/remove-cout-2797
Remove cout calls from FBX, LWO and B3D
|
2019-12-06 19:52:56 +00:00 |
Malcolm Tyrrell
|
a2f8c84c6c
|
Fix deletion issue in aiMetadata::Add.
|
2019-12-05 17:06:28 +00:00 |
|
Malcolm Tyrrell
|
24f0a400b7
|
Extra comments.
|
2019-12-05 15:11:46 +00:00 |
|
Malcolm Tyrrell
|
8956e567b2
|
Better comment.
|
2019-12-05 14:09:36 +00:00 |
|
Malcolm Tyrrell
|
6639d5180b
|
Add a test for gltf2 and FBX metadata.
|
2019-12-05 14:05:49 +00:00 |
|
Malcolm Tyrrell
|
81984002d3
|
Fix and test for GLTF.
|
2019-12-05 13:52:34 +00:00 |
|
Malcolm Tyrrell
|
fabfcf3cb0
|
More checking
|
2019-12-05 12:33:00 +00:00 |
|
Malcolm Tyrrell
|
894b8e3519
|
Initial version
|
2019-12-05 12:32:22 +00:00 |
|
Gordon MacPherson
|
505769935e
|
Merge branch 'master' into remove-cout-2797
|
2019-12-04 22:38:50 +00:00 |
|
Kim Kulling
|
a29e407853
|
Update B3DImporter.cpp
some minor format changes: add brackets for one-liner if statement.
|
2019-12-04 21:25:17 +01:00 |
|
Gordon MacPherson
|
81cb2433bc
|
Merge pull request #2779 from turbosquid/fix_gltf_accessor_overflow
Fix glTF validation error related to accessor min and max values
|
2019-12-04 13:43:38 +00:00 |
|
Gordon MacPherson
|
bdb89413bc
|
Merge branch 'master' into fix_gltf_accessor_overflow
|
2019-12-03 22:20:19 +00:00 |
|
Kim Kulling
|
a8c251fa37
|
Merge pull request #2769 from muxanickms/preserve_error_string
Error string of Importer should contain a message in case of an exception
|
2019-12-03 20:28:37 +01:00 |
RichardTea
|
e5b065da3e
|
Formatter is a stringstream
Used wrong API. Sorry about that.
|
2019-12-03 13:35:53 +00:00 |
|
RichardTea
|
3a977d009d
|
Merge branch 'master' into remove-cout-2797
|
2019-12-03 13:24:03 +00:00 |
|
Kim Kulling
|
e5edd8a28a
|
Merge branch 'master' into preserve_error_string
|
2019-12-03 11:29:35 +01:00 |
|
Kim Kulling
|
a98a8edb71
|
Merge pull request #2770 from muxanickms/fix_memory_leak_in_gltf2_on_exception
Fix for memory leak in glTF2 Importer if an exception has been thrown
|
2019-12-03 11:28:22 +01:00 |
|
Kim Kulling
|
903ce59ffe
|
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception
|
2019-12-02 19:07:44 +01:00 |
|
Kim Kulling
|
fc5e4b22e2
|
Merge pull request #2752 from thomasbiang/fix_vertex_weighted_repeatedly
avoid weighting vertex repeatedly when joining identical vertices
|
2019-12-02 18:44:46 +01:00 |
|
RichardTea
|
496382982a
|
Remove cout calls from FBX, LWO and B3D
Fixes #2797
|
2019-12-02 11:56:55 +00:00 |
Mike Samsonov
|
631da3a3d1
|
Merge branch 'master' into preserve_error_string
|
2019-12-02 10:35:29 +00:00 |
|
RichardTea
|
5297529bb1
|
MSVC: Disable optimisations in debug build
Fixes #2799 and #2785
|
2019-12-02 10:07:48 +00:00 |
Cory Fabre
|
7c0f84f484
|
Merge branch 'master' into fix_gltf_accessor_overflow
|
2019-12-01 19:31:44 -06:00 |
|
Kim Kulling
|
4071fcd398
|
Update Exporter.cpp
Fix format.
|
2019-12-01 22:46:48 +01:00 |
|
Kim Kulling
|
54720e36cb
|
Merge branch 'master' into fix_vertex_weighted_repeatedly
|
2019-12-01 22:46:18 +01:00 |
|
Kim Kulling
|
6117c3f589
|
Merge pull request #2792 from migenius/migenius-fix-dracocrash
Migenius fix dracocrash
|
2019-12-01 16:33:49 +01:00 |
|
Kim Kulling
|
7967deb06a
|
Update glTF2Asset.inl
some minor review finding: use brackets and add a newline.
|
2019-12-01 12:34:45 +01:00 |
|
Kim Kulling
|
bf3b5f4e58
|
Merge branch 'master' into migenius-fix-dracocrash
|
2019-12-01 12:32:44 +01:00 |
|
Gordon MacPherson
|
ef4bf35f69
|
Merge branch 'master' into fix_gltf_accessor_overflow
|
2019-11-30 17:11:07 +00:00 |
|
Kim Kulling
|
11c69c2aaf
|
Merge pull request #2789 from assimp/kimkulling-patch-1
Update CMakeLists.txt
|
2019-11-28 20:24:19 +01:00 |
Paul Arden
|
97b71dd03b
|
Add reading of extensionsRequired and explicit check to throw an error if Draco compression is required. Fixes issue #2791.
|
2019-11-28 09:01:01 +10:00 |
|
ardenpm
|
9f6a010e05
|
Merge pull request #12 from assimp/master
Pull latest from upstream master.
|
2019-11-28 09:18:30 +11:00 |
|
Kim Kulling
|
c9155160f4
|
Merge branch 'master' into kimkulling-patch-1
|
2019-11-27 22:03:22 +01:00 |
|
Kim Kulling
|
084a88498e
|
Merge pull request #2787 from migenius/migenius-fix-khrtexturetransform
Migenius fix khrtexturetransform
|
2019-11-27 19:42:52 +01:00 |
|
Kim Kulling
|
4754d2dc6d
|
Update CMakeLists.txt
- closes https://github.com/assimp/assimp/issues/2785
- Disable optimization in debug mode.
|
2019-11-27 17:32:55 +01:00 |
|
Kim Kulling
|
30851b796f
|
Update glTF2Importer.cpp
Make them const
|
2019-11-27 17:18:12 +01:00 |
|
Paul Arden
|
e4f1b8e609
|
Correctly change the coordinate system of the glTF UV transforms to match those used internally inside Assimp. This should now hopefully result in a complete implementation for issue #2119
|
2019-11-27 11:05:31 +11:00 |
|
ardenpm
|
81ffacfc34
|
Merge pull request #11 from assimp/master
Merge upstream master
|
2019-11-27 07:32:40 +11:00 |
|
Gordon MacPherson
|
f52df5d242
|
Merge branch 'master' into fix_gltf_accessor_overflow
|
2019-11-26 18:42:07 +00:00 |
|
Kim Kulling
|
12b7fafb3f
|
Merge pull request #2782 from migenius/migenius-fix-doubleexport
Migenius fix doubleexport
|
2019-11-26 18:07:12 +01:00 |
|
Paul Arden
|
fdd76a6d0b
|
Merge branch 'migenius-fix-doubleexport' of github.com:migenius/assimp into migenius-fix-doubleexport
|
2019-11-26 18:17:55 +11:00 |