Commit Graph

8069 Commits (91ecad5da8ae31deceed17fe07ec8646a49babba)

Author SHA1 Message Date
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
Dylan Kenneally 718d325b7c
Merge branch 'master' into warning-level-max 2019-11-21 12:15:33 +11:00
Dylan Kenneally 97dc0ce15d Added CMake option to set the compiler warning to max (-Wall /W4). Off by default 2019-11-21 12:04:53 +11: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
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
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
Kim Kulling f0358fbe84
Merge pull request #2764 from assimp/kimkullig_dev
Kimkullig dev
2019-11-19 00:39:01 +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
Mike Samsonov 80f5283b2f Error string of Importer should contain a message in case of an exception 2019-11-18 16:57:01 +00: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 e9df0259bb Link to the new homepage 2019-11-18 03:07:57 +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 4ad2368116 disable samples per default. 2019-11-15 21:46:09 +01:00
Kim Kulling 3a8cb442f3 closes https://github.com/assimp/assimp/issues/2681: add dx11-sample to cmake. 2019-11-15 20:52:13 +01:00
Kim Kulling 9493ec670d Merge branch 'kimkullig_dev' of https://github.com/assimp/assimp into kimkullig_dev 2019-11-15 19:39:14 +01:00
Kim Kulling a8182d86cb fix initialization + some vs2019 compiler warnings. 2019-11-15 19:38:37 +01:00
Kim Kulling 13a4619817
Merge branch 'master' into kimkullig_dev 2019-11-15 18:52:04 +01:00
Kim Kulling 17946e26ef add missing setup of texture transform in aiMaterial. 2019-11-15 18:35:33 +01:00
Kim Kulling 74080a083a add texture-transfrm unittest. 2019-11-14 21:15:30 +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 a9f82dbe0b
Merge pull request #2758 from jcarpent/topic/c++11
BUG - use noexcept only for C++11 and more
2019-11-12 18:49:33 +01:00
Kim Kulling 0c3c88270a
Merge branch 'master' into master 2019-11-11 10:19:22 +01:00
Justin Carpentier 28a9fb31fd
Merge branch 'master' into topic/c++11 2019-11-10 13:20:05 +01:00
Kim Kulling d5ac333005
Merge pull request #2759 from assimp/kimkullig_dev
closes https://github.com/assimp/assimp/issues/1320: make sure build …
2019-11-10 12:08:05 +01:00
thewoz 73274316be Merge remote-tracking branch 'upstream/master' 2019-11-10 11:50:38 +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
Justin Carpentier 031d3b648e
defs: use noexcept only for C++11 and more 2019-11-10 08:23:17 +01:00
Kim Kulling 595f937ff9
Merge pull request #2757 from assimp/kimkullig_dev
closes https://github.com/assimp/assimp/issues/2684: normalize path
2019-11-09 17:55:11 +01:00
Kim Kulling 58729b1b3d fix debug-target. 2019-11-09 11:28:56 +01:00
Kim Kulling b63285f9ad closes https://github.com/assimp/assimp/issues/2684: normalize path 2019-11-09 11:12:47 +01:00
Yingying Wang ddf7c0ad8f avoid weighting vertex repeatedly when joining identical vertices 2019-11-05 17:34:32 -08:00
Kim Kulling 78ec42fc17
Merge pull request #2751 from muxanickms/export_fbx_bigger_than_2GB_fix
Fix for exporting fbx bigger than 2GB
2019-11-05 21:54:55 +01:00
Mike Samsonov adec426b7c Fix for exporting fbx bigger than 2GB 2019-11-05 17:11:56 +00:00