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
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
9f6a010e05
Merge pull request #12 from assimp/master
...
Pull latest from upstream master.
2019-11-28 09:18:30 +11:00
c9155160f4
Merge branch 'master' into kimkulling-patch-1
2019-11-27 22:03:22 +01:00
084a88498e
Merge pull request #2787 from migenius/migenius-fix-khrtexturetransform
...
Migenius fix khrtexturetransform
2019-11-27 19:42:52 +01:00
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
30851b796f
Update glTF2Importer.cpp
...
Make them const
2019-11-27 17:18:12 +01:00
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
81ffacfc34
Merge pull request #11 from assimp/master
...
Merge upstream master
2019-11-27 07:32:40 +11:00
f52df5d242
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-26 18:42:07 +00:00
12b7fafb3f
Merge pull request #2782 from migenius/migenius-fix-doubleexport
...
Migenius fix doubleexport
2019-11-26 18:07:12 +01:00
fdd76a6d0b
Merge branch 'migenius-fix-doubleexport' of github.com:migenius/assimp into migenius-fix-doubleexport
2019-11-26 18:17:55 +11:00
b4f778f53b
Fix aiGetMaterialUVTransform which assumed the data was 4 floats when in fact it is 5 floats. Fixes and issue seen in #2119 .
2019-11-26 18:17:35 +11:00
184caea952
Merge branch 'master' into migenius-fix-doubleexport
2019-11-25 21:24:35 +01:00
6e7e459ed0
Merge pull request #2783 from bztsrc/master
...
MinGW support, profiling and signed error code
2019-11-25 21:12:34 +01:00
7230f32c14
Fix issue with y UV translation. Fixes #2119 .
2019-11-25 20:58:21 +11:00
8f2123379d
Merge branch 'master' into master
2019-11-25 05:23:18 +01:00
9ddeb4edad
MinGW support, profiling and signed error code
2019-11-25 05:03:10 +01:00
929d83398d
Remove duplicate call to exporter. Fixes issue #2718 .
2019-11-25 13:51:33 +11:00
aff323981c
Merge pull request #10 from assimp/master
...
Update to master
2019-11-25 13:29:27 +11:00
16397c1849
Merge pull request #2780 from LoicFr/master
...
Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags
2019-11-23 15:52:56 +01:00
5cfb0fd633
Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags
2019-11-22 18:27:34 +01:00
136996e1f6
Use std::numeric_limits for double max
2019-11-22 10:56:31 -06:00
981c4b6302
Merge pull request #2727 from da-raf/master
...
ColladaParser: fix handling of empty XML-elements
2019-11-22 17:04:52 +01:00
868aea8d94
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-11-22 08:19:50 +01:00
36ca37f9ac
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-22 00:14:11 -06:00
Gordon MacPherson
Kim Kulling
RichardTea
Mike Samsonov
Cory Fabre
Paul Arden
Zoltan Baldaszti
bzt
Loïc