d24adbd32c
aiString.length is really of type "ai_uint32" which corresponds to "c_uint32"
...
and not to "c_size_t" (which is different on 64bit systems and 32bit systems!)
Closes: https://github.com/assimp/assimp/issues/2788
2019-12-07 22:09:03 +01:00
298a89b4ee
remove trailing whitespace
2019-12-07 22:06:14 +01:00
71cac7ab8d
lower-case PEP263 encoding declaration
...
so emacs likes it...
2019-12-07 22:04:04 +01:00
747e12465b
Merge branch 'master' into partial-cleanup-m3d
2019-12-07 19:43:05 +01:00
e7ed315145
Merge pull request #2801 from RichardTea/fix-2799-2785
...
MSVC: Disable optimisations in debug build
2019-12-07 19:34:54 +01:00
f9e861527b
Merge branch 'master' into fix-2799-2785
2019-12-07 13:47:25 +01:00
016115628e
Merge pull request #2810 from MalcolmTyrrell/ModellerMetaData
...
Modeller meta data
2019-12-07 13:40:21 +01:00
9f3c26dbd8
Update Importer.cpp
...
fix typo
2019-12-07 09:18:45 +01:00
7648c438ca
Update Importer.cpp
...
fix more typos.
2019-12-07 09:08:15 +01:00
26f6e5ad30
Update Importer.cpp
...
fix typo
2019-12-07 08:58:47 +01:00
ef13fb2ddd
Update Importer.cpp
...
Fix minor review findings.
2019-12-06 21:38:07 +01:00
c1706d9bf8
Update metadata.h
...
Fix possible crashes.
2019-12-06 21:24:04 +01:00
b2ab3fa35e
Merge branch 'master' into ModellerMetaData
2019-12-06 21:19:29 +01:00
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
a2f8c84c6c
Fix deletion issue in aiMetadata::Add.
2019-12-05 17:06:28 +00:00
24f0a400b7
Extra comments.
2019-12-05 15:11:46 +00:00
8956e567b2
Better comment.
2019-12-05 14:09:36 +00:00
6639d5180b
Add a test for gltf2 and FBX metadata.
2019-12-05 14:05:49 +00:00
81984002d3
Fix and test for GLTF.
2019-12-05 13:52:34 +00:00
fabfcf3cb0
More checking
2019-12-05 12:33:00 +00:00
894b8e3519
Initial version
2019-12-05 12:32:22 +00:00
505769935e
Merge branch 'master' into remove-cout-2797
2019-12-04 22:38:50 +00:00
a29e407853
Update B3DImporter.cpp
...
some minor format changes: add brackets for one-liner if statement.
2019-12-04 21:25:17 +01:00
fadf4a3ee2
Update M3DWrapper.h
...
Add missing include.
Odd that MSVC2013-2017, GCC and Clang were ok with this.
2019-12-04 14:05:46 +00:00
d8608156d3
Merge branch 'master' into partial-cleanup-m3d
2019-12-04 14:00:33 +00:00
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
bdb89413bc
Merge branch 'master' into fix_gltf_accessor_overflow
2019-12-03 22:20:19 +00:00
b10b8b2f1e
Merge branch 'master' into warning-level-max
2019-12-03 21:57:04 +01:00
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
4a29cc7fcb
Merge branch 'master' into partial-cleanup-m3d
2019-12-03 14:16:11 +00:00
45a96af9ac
Fix typo in M3DWrapper.cpp
...
Don't use std::mutex if not supported.
Allow override to force it to be used if does in fact exist
Thank you CI
2019-12-03 14:15:50 +00:00
e5b065da3e
Formatter is a stringstream
...
Used wrong API. Sorry about that.
2019-12-03 13:35:53 +00:00
3a977d009d
Merge branch 'master' into remove-cout-2797
2019-12-03 13:24:03 +00:00
ee537b70ad
Correct M3DWrapper ifdef guards
...
M3DWrapper should also compile if M3D Importer is enabled
2019-12-03 13:18:59 +00:00
e668eead19
Some cleanup of M3D support
...
Wrap the m3d.h header
Note: C++11 support required to use in a threaded environment
Fix export memory leak (although exporter apopears to be unused)
Apply clangformat.
2019-12-03 12:56:21 +00:00
e5edd8a28a
Merge branch 'master' into preserve_error_string
2019-12-03 11:29:35 +01:00
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
903ce59ffe
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception
2019-12-02 19:07:44 +01:00
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
496382982a
Remove cout calls from FBX, LWO and B3D
...
Fixes #2797
2019-12-02 11:56:55 +00:00
631da3a3d1
Merge branch 'master' into preserve_error_string
2019-12-02 10:35:29 +00:00
5297529bb1
MSVC: Disable optimisations in debug build
...
Fixes #2799 and #2785
2019-12-02 10:07:48 +00:00
7c0f84f484
Merge branch 'master' into fix_gltf_accessor_overflow
2019-12-01 19:31:44 -06:00
4071fcd398
Update Exporter.cpp
...
Fix format.
2019-12-01 22:46:48 +01:00
54720e36cb
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-12-01 22:46:18 +01:00
6117c3f589
Merge pull request #2792 from migenius/migenius-fix-dracocrash
...
Migenius fix dracocrash
2019-12-01 16:33:49 +01:00
7967deb06a
Update glTF2Asset.inl
...
some minor review finding: use brackets and add a newline.
2019-12-01 12:34:45 +01:00
bf3b5f4e58
Merge branch 'master' into migenius-fix-dracocrash
2019-12-01 12:32:44 +01:00
ef4bf35f69
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-30 17:11:07 +00:00
11c69c2aaf
Merge pull request #2789 from assimp/kimkulling-patch-1
...
Update CMakeLists.txt
2019-11-28 20:24:19 +01:00
IOhannes m zmölnig
Kim Kulling
Gordon MacPherson
Malcolm Tyrrell
RichardTea
Mike Samsonov
Cory Fabre