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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Kim Kulling
|
6e7e459ed0
|
Merge pull request #2783 from bztsrc/master
MinGW support, profiling and signed error code
|
2019-11-25 21:12:34 +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 |
|
ardenpm
|
aff323981c
|
Merge pull request #10 from assimp/master
Update to master
|
2019-11-25 13:29:27 +11:00 |
|
Kim Kulling
|
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 |
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 |
|
Kim Kulling
|
981c4b6302
|
Merge pull request #2727 from da-raf/master
ColladaParser: fix handling of empty XML-elements
|
2019-11-22 17:04:52 +01:00 |
|
Kim Kulling
|
868aea8d94
|
Merge branch 'master' into fix_vertex_weighted_repeatedly
|
2019-11-22 08:19:50 +01:00 |
|
Kim Kulling
|
3cc4ec4eec
|
Merge branch 'master' into master
|
2019-11-21 22:10:28 +01:00 |
|
Kim Kulling
|
0934c6e277
|
Merge pull request #2766 from bztsrc/master
Updated M3D SDK and some fixes
|
2019-11-21 22:09:21 +01:00 |
|
Kim Kulling
|
da6f474188
|
Merge branch 'master' into master
|
2019-11-21 17:44:07 +01:00 |
|
Kim Kulling
|
e67b92885d
|
Merge pull request #2775 from assimp/kimkulling-patch-1
Update Readme.md
|
2019-11-21 10:36:07 +01:00 |
|
Kim Kulling
|
42fa22f85e
|
Update Readme.md
Add doc for glTF2.0 for supported extenstions
|
2019-11-20 21:26:36 +01:00 |
|
Kim Kulling
|
fea84aaba3
|
Merge pull request #2771 from assimp/kimkullig_dev
closes https://github.com/assimp/assimp/issues/2733: update of zlip t…
|
2019-11-20 20:53:06 +01:00 |
|
Zoltan Baldaszti
|
6b63aa6159
|
Merge branch 'master' into master
|
2019-11-20 16:55:22 +01:00 |
Kim Kulling
|
f78446b14a
|
closes https://github.com/assimp/assimp/issues/2733: update of zlip to fix gcc build for v9.2.0 32 bit
|
2019-11-19 20:30:40 +01:00 |
|
Kim Kulling
|
8ca476954a
|
Merge pull request #2748 from thewoz/master
Update .gitignore
|
2019-11-19 20:13:00 +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 |
|
Kim Kulling
|
abdbecfca2
|
Merge branch 'master' into master
|
2019-11-19 16:29:59 +01:00 |
|
Zoltan Baldaszti
|
7c312f6f68
|
Merge branch 'master' into master
|
2019-11-19 01:28:11 +01:00 |