Commit Graph

4334 Commits

Author SHA1 Message Date
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
Kim Kulling
3cc4ec4eec Merge branch 'master' into master 2019-11-21 22:10:28 +01: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
bzt
83e9c551f5 stbi functions prefixed for those who do not know how to use inlcude 2019-11-18 18:31:53 +01:00
bzt
301748be6a Make Clang happy 2019-11-18 15:22:15 +01:00
bzt
2b252bb9a5 My mistake, fixed 2019-11-18 06:23:41 +01:00
Zoltan Baldaszti
2bd92aeb88 Merge branch 'master' into master 2019-11-18 03:21:34 +01:00
bzt
41ae01a6b2 Upgraded to newest SDK and improved texture import 2019-11-18 03:04:52 +01:00
Kim Kulling
75204e20bd fix invalid setup for texture enum. 2019-11-16 19:22:37 +01:00
Kim Kulling
17257cd2ae just a try, i dunno have a clue ... 2019-11-16 15:51:26 +01:00
Kim Kulling
2eed8b1820 TextureTransform: set material transform only when the extension is provided. 2019-11-16 08:08:57 +01:00
Kim Kulling
a8182d86cb fix initialization + some vs2019 compiler warnings. 2019-11-15 19:38:37 +01:00
Kim Kulling
17946e26ef add missing setup of texture transform in aiMaterial. 2019-11-15 18:35:33 +01:00
Kim Kulling
04db5cd5ea closes https://github.com/assimp/assimp/issues/2119: initial version. 2019-11-14 21:11:53 +01:00
Kim Kulling
0c3c88270a Merge branch 'master' into master 2019-11-11 10:19:22 +01:00
Kim Kulling
aa25c815bd closes https://github.com/assimp/assimp/issues/1320: make sure build works with all exporter disabled. 2019-11-10 09:47:50 +01:00
Mike Samsonov
adec426b7c Fix for exporting fbx bigger than 2GB 2019-11-05 17:11:56 +00:00
Kim Kulling
d29185ec7d Merge branch 'master' into master 2019-11-03 21:22:01 +01:00
Zoltan Baldaszti
dda46f5f4d Merge branch 'master' into master 2019-11-02 01:14:04 +01:00
bzt
7201ebdccc Make Clang happy 2019-11-01 21:52:11 +01:00
bzt
7d9e9aadbb Asked modifications and unit test 2019-11-01 17:21:24 +01:00
Mike Samsonov
536fea1c8d operator less for old compilers 2019-11-01 14:50:30 +00:00
Mike Samsonov
55c2a3edb9 FBX orphant embedded textures 2019-11-01 12:29:54 +00:00
bzt
8ebd48442e Made the M3D SDK C++ wrapper optional 2019-11-01 03:39:36 +01:00
Kim Kulling
805bc2e766 Update ColladaParser.cpp
Add missing brackets.
2019-10-31 20:18:39 +01:00
bzt
3bf81375da Fixed clang's problem with register keyword 2019-10-30 03:06:24 +01:00
bzt
37cc29c020 Fixed clang's problem with register keyword 2019-10-30 03:04:33 +01:00
bzt
0ff3e40157 Fixed clang's casting issue and MSVC's buffer allocation problem 2019-10-30 02:35:51 +01:00
bzt
60e9157699 Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this 2019-10-30 01:37:28 +01:00
bzt
5a79287041 More reduced scope fix, what's wrong with reusing i as a loop variable? 2019-10-30 01:21:15 +01:00
bzt
7ed621b53f More reduced scope fix by wasting more memory... 2019-10-30 01:14:20 +01:00
bzt
1c23d2e8de More reduced scope fix by wasting more memory... 2019-10-30 01:11:34 +01:00
bzt
5b18baf883 Fixed issues with MSVC 2019-10-30 00:55:54 +01:00
RevoluPowered
02a63f8b10 Fixed template being used in file 2019-10-29 20:21:16 +00:00
Kim Kulling
be09110aa8 Merge branch 'master' into feature/easy-armature-lookup 2019-10-29 21:09:50 +01:00
bzt
a622e109a0 Fixed PR Quality Review Issues 2019-10-29 18:42:10 +01:00
bzt
0baec5f0bd Added M3D format support 2019-10-29 14:14:00 +01:00
Kim Kulling
459d8105a7 Merge branch 'master' into fix-3ds-material-names 2019-10-29 13:18:23 +01:00
Kim Kulling
18555abed0 Merge branch 'master' into migenius-fix-pbrsg 2019-10-28 20:08:47 +01:00
Kim Kulling
571d64e3c1 Merge branch 'master' into migenius-fix-doublefree 2019-10-28 07:51:19 +01:00
Kim Kulling
61ea5a4ac6 Merge branch 'master' into collada_zae_textures_2710 2019-10-27 18:24:16 +01:00
RevoluPowered
a9a0d4d29b Tidying order of function calls and fixed debug statements 2019-10-27 14:16:39 +00:00
RevoluPowered
212bcfe75c Test disable cache 2019-10-27 14:16:39 +00:00
RevoluPowered
9c8d835704 Explicitly use nullptr 2019-10-27 14:16:39 +00:00