Commit Graph

8446 Commits (da8b174ecb008d4fd3ce9d761e157515e4471df0)

Author SHA1 Message Date
Kim Kulling da8b174ecb
Merge pull request #3069 from ms-maxvollmer/GLTF2_guarantee_rootnode_fix
GLTF2: Fixed behavior of glTF2Importer::ImportNodes
2020-03-26 11:12:33 +01:00
Max Vollmer (Microsoft Havok) ef20cdc430
Merge branch 'master' into GLTF2_guarantee_rootnode_fix 2020-03-24 11:56:42 +00:00
Kim Kulling 16725cc3f6
Merge pull request #3075 from aimoonchen/fix_FBX_no_preservePivots_bug
fix FBX no preservePivots bug
2020-03-24 11:55:44 +01:00
simon chen 891b1d4b3f
Merge branch 'master' into fix_FBX_no_preservePivots_bug 2020-03-24 14:38:23 +08:00
Kim Kulling da04a8e39a
Merge pull request #3083 from asmaloney/cmake-submodule
{cmake} Prefix options to avoid pollution when included as a submodule
2020-03-23 19:56:09 +01:00
Andy Maloney 046f50880f {cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule
When libraries are included as submodules in large projects, having an option with a generic name like "BUILD_DOCS" is not very helpful. (e.g. one project I work on includes many libraries as submodules)

It can also clash with options from other libraries which can break things.
2020-03-23 12:35:32 -04:00
Max Vollmer (Microsoft Havok) 973e38ad97
Merge branch 'master' into GLTF2_guarantee_rootnode_fix 2020-03-23 07:57:38 +00:00
Kim Kulling 7e5a0acc48
Merge pull request #3012 from assimp/enable_vs_warning_all
[WIP] Enable all warnings for Visual Studio.
2020-03-22 16:56:11 +01:00
Kim Kulling c0ae9b6040 fix invalid check 2020-03-22 14:21:24 +01:00
Kim Kulling 14860f3822 fix warning. 2020-03-22 13:34:27 +01:00
Kim Kulling 68a9fa2df3 reformat unittests. 2020-03-22 12:13:09 +01:00
Kim Kulling edc73552cd fix another warning: missing override. 2020-03-22 09:17:44 +01:00
Kim Kulling 378c87ccf4 Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all 2020-03-21 20:10:44 +01:00
Kim Kulling 14aea3f1a4 fix another unittest warning. 2020-03-21 20:10:40 +01:00
Kim Kulling 4283e61189 fix clang-compiler warning: wrong move constructor. 2020-03-21 18:25:49 +01:00
Kim Kulling 2d0f8093d8 Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all 2020-03-21 18:03:53 +01:00
Kim Kulling 089ab0693a fix static-code-analysis check. 2020-03-21 18:03:35 +01:00
Kim Kulling 62415bca40
Merge branch 'master' into enable_vs_warning_all 2020-03-21 17:37:54 +01:00
Kim Kulling 0c3933ca7c
Merge pull request #3078 from assimp/kimkulling-githubactions
Create ccpp.yml
2020-03-21 17:37:21 +01:00
Kim Kulling b4bc91c13b
Update Readme.md
Add github actions badge.
2020-03-21 16:22:18 +01:00
Kim Kulling 4b1aaff0dc
Create ccpp.yml 2020-03-21 10:59:32 +01:00
Kim Kulling 7d624e7f60 obj: add missing init. 2020-03-21 09:00:29 +01:00
Kim Kulling 7fda14078b
Merge branch 'master' into enable_vs_warning_all 2020-03-21 08:57:15 +01:00
Kim Kulling 9f7d9becb2 fix the linux build. 2020-03-21 08:56:49 +01:00
kkulling b40769c395 try to fix linux build.2 2020-03-20 13:18:49 +01:00
chenmou.cm 7c3fd351d3 fix no preservePivots bug 2020-03-20 17:19:27 +08:00
kimkulling dd58568d60 fix vs2013 warnings in unittests 2020-03-20 10:04:44 +01:00
kimkulling ac3f08a4d8 fix 3rdparty warnings. 2020-03-20 09:49:36 +01:00
kimkulling 2ee948eb84 fix missing parthesis. 2020-03-19 17:07:21 +01:00
kimkulling 5b8e6832c3 add mssing move constructor. 2020-03-19 16:53:05 +01:00
kimkulling de06c860ea add missing constructor. 2020-03-19 16:20:55 +01:00
kimkulling 9ba014739a fix compiler warning. 2020-03-19 15:25:34 +01:00
kimkulling 4de4c34fb2 ry to fix 2013-specific warnings in mesh.h 2020-03-19 15:10:46 +01:00
kimkulling 4d917c97bd fix warnings detected in vs2017. 2020-03-19 12:58:41 +01:00
kimkulling 68f7f545a9 fix typo. 2020-03-19 11:09:20 +01:00
Kim Kulling 9aa5e3e04f fix new vs2013 warnings. 2020-03-18 21:32:17 +01:00
Kim Kulling 097d2faeea fix vs2013 specific warnings. 2020-03-18 19:31:30 +01:00
kimkulling d1afd97ec2 fix 2 more warnings for vs2013. 2020-03-18 16:48:32 +01:00
kimkulling 2eb8ff7136 disable 2 more warnings for vs2013. 2020-03-18 16:37:02 +01:00
Kim Kulling 017b3238ba
Update IFCReaderGen_2x3.h
Fix a typo
2020-03-18 16:20:38 +01:00
Kim Kulling 959446e416
Update IFCReaderGen_2x3.h
Disable warning
2020-03-18 15:52:16 +01:00
Kim Kulling db74f35410
Merge pull request #3067 from ms-maxvollmer/FBXParser_check_inputlength_fix
Added test case for fix earlier submitted
2020-03-18 11:48:29 +01:00
Kim Kulling f68c60c7c6
Update StepReaderGen.h
disable warning
2020-03-17 20:32:23 +01:00
Kim Kulling a2fa19aa78
Merge branch 'master' into enable_vs_warning_all 2020-03-17 19:19:29 +01:00
Kim Kulling eead99b7a6
Merge branch 'master' into FBXParser_check_inputlength_fix 2020-03-16 20:43:37 +01:00
kimkulling a9e8f65941 fix the build - add misisng forward declaration for aiVector3t. 2020-03-16 10:50:07 +01:00
Kim Kulling 3e78e8b5d3
Merge pull request #3063 from thomasbiang/gltf2_blendshape_export
Blendshape Support in Assimp Gltf2/Glb2 Exporter (positions, normals)
2020-03-16 10:24:01 +01:00
Max Vollmer (Microsoft Havok) 8c3c87793e
Merge branch 'master' into GLTF2_guarantee_rootnode_fix 2020-03-16 07:46:27 +00:00
Max Vollmer (Microsoft Havok) c9cf661b29
Merge branch 'master' into FBXParser_check_inputlength_fix 2020-03-16 07:40:07 +00:00
Kim Kulling 27c125ef4d Add 2013-spcific compiler warning disabling statements. 2020-03-15 18:22:49 +01:00