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
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
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
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
981c4b6302
Merge pull request #2727 from da-raf/master
...
ColladaParser: fix handling of empty XML-elements
2019-11-22 17:04:52 +01:00
3cc4ec4eec
Merge branch 'master' into master
2019-11-21 22:10:28 +01:00
0934c6e277
Merge pull request #2766 from bztsrc/master
...
Updated M3D SDK and some fixes
2019-11-21 22:09:21 +01:00
da6f474188
Merge branch 'master' into master
2019-11-21 17:44:07 +01:00
e67b92885d
Merge pull request #2775 from assimp/kimkulling-patch-1
...
Update Readme.md
2019-11-21 10:36:07 +01:00
42fa22f85e
Update Readme.md
...
Add doc for glTF2.0 for supported extenstions
2019-11-20 21:26:36 +01:00
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
6b63aa6159
Merge branch 'master' into master
2019-11-20 16:55:22 +01:00
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
8ca476954a
Merge pull request #2748 from thewoz/master
...
Update .gitignore
2019-11-19 20:13:00 +01:00
abdbecfca2
Merge branch 'master' into master
2019-11-19 16:29:59 +01:00
7c312f6f68
Merge branch 'master' into master
2019-11-19 01:28:11 +01:00
f0358fbe84
Merge pull request #2764 from assimp/kimkullig_dev
...
Kimkullig dev
2019-11-19 00:39:01 +01:00
7e222f0730
fix invalid cast.
2019-11-18 18:43:28 +01:00
83e9c551f5
stbi functions prefixed for those who do not know how to use inlcude
2019-11-18 18:31:53 +01:00
301748be6a
Make Clang happy
2019-11-18 15:22:15 +01:00
2b252bb9a5
My mistake, fixed
2019-11-18 06:23:41 +01:00
2bd92aeb88
Merge branch 'master' into master
2019-11-18 03:21:34 +01:00
e9df0259bb
Link to the new homepage
2019-11-18 03:07:57 +01:00
41ae01a6b2
Upgraded to newest SDK and improved texture import
2019-11-18 03:04:52 +01:00
75204e20bd
fix invalid setup for texture enum.
2019-11-16 19:22:37 +01:00
17257cd2ae
just a try, i dunno have a clue ...
2019-11-16 15:51:26 +01:00
2eed8b1820
TextureTransform: set material transform only when the extension is provided.
2019-11-16 08:08:57 +01:00
4ad2368116
disable samples per default.
2019-11-15 21:46:09 +01:00
RichardTea
Kim Kulling
Paul Arden
Zoltan Baldaszti
bzt
Loïc
Kim Kulling