Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

6877 Commits

Author SHA1 Message Date
Kim Kulling
b2ab3fa35e Merge branch 'master' into ModellerMetaData 2019-12-06 21:19:29 +01:00
Malcolm Tyrrell
8956e567b2 Better comment. 2019-12-05 14:09:36 +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
RichardTea
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
RichardTea
d8608156d3 Merge branch 'master' into partial-cleanup-m3d 2019-12-04 14:00:33 +00:00
Gordon MacPherson
bdb89413bc Merge branch 'master' into fix_gltf_accessor_overflow 2019-12-03 22:20:19 +00:00
RichardTea
4a29cc7fcb Merge branch 'master' into partial-cleanup-m3d 2019-12-03 14:16:11 +00:00
RichardTea
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
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
RichardTea
ee537b70ad Correct M3DWrapper ifdef guards 
M3DWrapper should also compile if M3D Importer is enabled
 2019-12-03 13:18:59 +00:00
RichardTea
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
Kim Kulling
e5edd8a28a Merge branch 'master' into preserve_error_string 2019-12-03 11:29:35 +01:00
Kim Kulling
903ce59ffe Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception 2019-12-02 19:07:44 +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
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
7967deb06a Update glTF2Asset.inl 
some minor review finding: use brackets and add a newline.
 2019-12-01 12:34:45 +01:00
Gordon MacPherson
ef4bf35f69 Merge branch 'master' into fix_gltf_accessor_overflow 2019-11-30 17:11:07 +00: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
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
Gordon MacPherson
f52df5d242 Merge branch 'master' into fix_gltf_accessor_overflow 2019-11-26 18:42:07 +00: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
Paul Arden
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
Kim Kulling
184caea952 Merge branch 'master' into migenius-fix-doubleexport 2019-11-25 21:24:35 +01:00
Paul Arden
7230f32c14 Fix issue with y UV translation. Fixes #2119. 2019-11-25 20:58:21 +11:00
Zoltan Baldaszti
8f2123379d Merge branch 'master' into master 2019-11-25 05:23:18 +01:00
bzt
9ddeb4edad MinGW support, profiling and signed error code 2019-11-25 05:03:10 +01:00
Paul Arden
929d83398d Remove duplicate call to exporter. Fixes issue #2718. 2019-11-25 13:51:33 +11:00
Loïc
5cfb0fd633 Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags 2019-11-22 18:27:34 +01:00
Cory Fabre
136996e1f6 Use std::numeric_limits for double max 2019-11-22 10:56:31 -06:00
Kim Kulling
868aea8d94 Merge branch 'master' into fix_vertex_weighted_repeatedly 2019-11-22 08:19:50 +01:00
Cory Fabre
36ca37f9ac Merge branch 'master' into fix_gltf_accessor_overflow 2019-11-22 00:14:11 -06:00
Cory Fabre
91e6d3abeb Fix glTF Accessor min and max values 2019-11-21 23:46:14 -06:00
Kim Kulling
3cc4ec4eec Merge branch 'master' into master 2019-11-21 22:10:28 +01:00
Mike Samsonov
375ee17339 Merge branch 'fix_memory_leak_in_gltf2_on_exception' of https://github.com/muxanickms/assimp into fix_memory_leak_in_gltf2_on_exception 2019-11-19 17:44:05 +00:00
Mike Samsonov
91af4b7476 fix the crash 2019-11-19 17:43:31 +00:00
Kim Kulling
5985bdfebf Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception 2019-11-19 18:11:10 +01:00
Mike Samsonov
12f184867e Fix for memory leak in glTF2 Importer if an exception has been thrown 2019-11-19 17:05:24 +00:00
Mike Samsonov
6f7cb6af06 revert memory leak fix 2019-11-19 16:58:48 +00:00
Mike Samsonov
b93c360b87 memory leak fix 2019-11-19 16:10:34 +00:00
Zoltan Baldaszti
7c312f6f68 Merge branch 'master' into master 2019-11-19 01:28:11 +01:00
Kim Kulling
7e222f0730 fix invalid cast. 2019-11-18 18:43:28 +01:00