Commit Graph

9782 Commits (fix_vs2017_warnings)

Author SHA1 Message Date
Kim Kulling 71e8c1001e
Merge pull request #3582 from makitsune/fix-gltf-vertex-colors
Fix glTF vertex colors with types other than float
2021-01-22 09:51:37 +01:00
Kim Kulling e435a43e53
Merge branch 'master' into fix-gltf-vertex-colors 2021-01-22 08:04:04 +01:00
Kim Kulling b64f1c40f4
Merge pull request #3600 from assimp/kimkulling-doc
Update Build.md
2021-01-22 07:59:18 +01:00
thomasbiang b3a35364ad
Merge branch 'master' into master 2021-01-21 13:38:21 -08:00
Kim Kulling 345726f5c8
Update Build.md 2021-01-21 20:56:21 +01:00
Kim Kulling 2bcf08370d
Merge branch 'master' into fix-gltf-vertex-colors 2021-01-21 11:54:02 +01:00
Kim Kulling 5e21b9f72d
Merge pull request #3580 from mmp/tdb/pbrt3_exporter
pbrt-v4 exporter
2021-01-21 11:48:19 +01:00
Kim Kulling 0b9cbb53ab
Merge branch 'master' into tdb/pbrt3_exporter 2021-01-21 11:27:35 +01:00
Kim Kulling fabea8ccd0
Merge pull request #3587 from assimp/build_fixes
Win32-refactorings
2021-01-21 11:26:45 +01:00
Kim Kulling 7dcac538f8
Merge branch 'master' into build_fixes 2021-01-21 09:03:06 +01:00
thomasbiang d7cf7847ba
Merge branch 'master' into master 2021-01-20 18:47:39 -08:00
ywang 01e61c8b9f customized node transformation format 2021-01-20 18:42:56 -08:00
Kim Kulling 4e0c4d7bb7
Update PbrtExporter.h 2021-01-20 21:11:14 +01:00
Kim Kulling 11a17ebfe6
Merge branch 'master' into tdb/pbrt3_exporter 2021-01-20 20:03:30 +01:00
RichardTea 8f4eff8d95 Increase ASSIMP_AI_REAL_TEXT_PRECISION
9 for float, 17 for double
2021-01-20 17:13:31 +00:00
RichardTea c1be6c76c8 Update gitignore for Visual Studio 2019
Default behaviour of VS2019 "Open Folder" for cmake projects:
- Build into "out/" folder in-source
- Store the config in CMakeSettings.json
- Keep VS info in .vs/ folder
2021-01-20 10:20:47 +00:00
RichardTea deac3a9f6c Add Draco 1.4.1 sources
Upstream: https://github.com/google/draco
2021-01-20 10:14:20 +00:00
xiaohunqupo 8ba1d38dea
Fix STL Expoter error. 2021-01-20 16:29:30 +08:00
kkulling 109ded407d Merge branch 'master' of https://github.com/assimp/assimp 2021-01-20 08:46:19 +01:00
Kim Kulling c52e5c4da8
Merge pull request #3592 from assimp/kimkulling-oss_fuzz29168
Fix nullptr access
2021-01-20 08:32:42 +01:00
Kim Kulling f8dd3a9aa6
Update DefaultIOSystem.cpp 2021-01-20 08:05:43 +01:00
Kim Kulling ed3e745752
Update DefaultIOSystem.cpp 2021-01-19 21:58:04 +01:00
Kim Kulling f05a57560b
Remove buggy method. 2021-01-19 21:27:50 +01:00
Kim Kulling 22f632d8d0
Merge branch 'master' into kimkulling-oss_fuzz29168 2021-01-19 21:21:28 +01:00
Kim Kulling 5b325af79f
Fix typo. 2021-01-19 21:19:42 +01:00
Kim Kulling 62e231b452
Merge pull request #3579 from ihsinme/ihsinme-patch-210
fixed memory leak
2021-01-19 21:18:34 +01:00
Kim Kulling 5a6498af92
Fix nullptr access 2021-01-19 21:14:38 +01:00
Kim Kulling 4008862a35
Merge branch 'master' into ihsinme-patch-210 2021-01-19 21:05:43 +01:00
Kim Kulling d12b1e8d70
Merge pull request #3591 from h3xx/fix-unzip-ftbfs
Fix build failure on Linux
2021-01-19 21:02:25 +01:00
Matt Pharr 8f5148f108
Merge branch 'master' into tdb/pbrt3_exporter 2021-01-18 17:15:40 -08:00
Dan Church 0bc5cf9fd3
Fix build failure on Linux 2021-01-18 16:17:28 -06:00
Kim Kulling 5a7f212162
Merge branch 'master' into ihsinme-patch-210 2021-01-18 21:55:42 +01:00
Kim Kulling 9a30887117
Merge pull request #3590 from assimp/kimkulling-oss_fuzz29401
Fix nullptr dereference in scenepreprocessor
2021-01-18 21:55:08 +01:00
Kim Kulling f24c042925
Fix typo 2021-01-18 20:28:38 +01:00
Kim Kulling 0803e5e6f3
Fix nullptr dereference in scenepreprocessor 2021-01-18 20:25:33 +01:00
Kim Kulling 0eb9005bc1
Merge pull request #3589 from assimp/kimkulling-off_fuzz28288
Fix overflow in aiString
2021-01-18 20:19:01 +01:00
Kim Kulling 11ee9d3673
Update types.h 2021-01-18 19:46:32 +01:00
Kim Kulling 5a764fff04
Fix overflow in aiString 2021-01-18 19:44:10 +01:00
kimkulling 7bb13e6272 Win32-refactorings 2021-01-18 08:39:39 +01:00
Kim Kulling 3c1d8850a4
Merge pull request #3586 from assimp/kimkulling-ossfuzz_issue29655
Fix Divide-by-zero in vector3
2021-01-17 20:53:45 +01:00
Kim Kulling 658fec3e61
Fix cast 2021-01-17 20:41:44 +01:00
Kim Kulling 0969bf3500
Fix Divide-by-zero in vector3
Fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=29655
2021-01-17 20:39:19 +01:00
Kim Kulling 061ef1f263
Merge pull request #3578 from gkv311/master
aiMaterial::GetTexture() - fix misleading description of path argument.
2021-01-16 17:16:05 +01:00
Kim Kulling aed0b3e53b
Merge branch 'master' into master 2021-01-16 16:37:57 +01:00
Kim Kulling 918c3abb32
Merge pull request #3585 from assimp/kimkulling-fix-zlib-deployment
remove install of zlibstatic
2021-01-16 16:25:29 +01:00
Kim Kulling 9334e07619
Update CMakeLists.txt 2021-01-16 16:14:49 +01:00
Kim Kulling 8ad2661e0c
Update CMakeLists.txt 2021-01-16 12:00:42 +01:00
Matt Pharr 17c79bcb94
Merge branch 'master' into tdb/pbrt3_exporter 2021-01-15 13:47:21 -08:00
RichardTea 7c9cddf786 Draco test file
2CylinderEngine from https://github.com/KhronosGroup/glTF-Sample-Models
2021-01-15 17:25:36 +00:00
Kim Kulling 6db343386b
remove install of zlibstatic 2021-01-15 16:46:15 +01:00