Kim Kulling
7a706be920
Delete cacheglobs.txt
2021-01-24 18:14:36 +01:00
Kim Kulling
dd0facd722
Delete appveyor.yml
2021-01-24 18:14:00 +01:00
Kim Kulling
9dc95be939
Merge pull request #3596 from RichardTea/vs_gitignore_update
...
Update gitignore for default VS2019 behaviour
2021-01-24 10:07:08 +01:00
Kim Kulling
5390e035d5
Merge branch 'master' into vs_gitignore_update
2021-01-24 09:47:12 +01:00
Kim Kulling
28c9bccbef
Merge pull request #3603 from assimp/kimkulling-remove_redundancy
...
Remove redundant statement in if
2021-01-22 14:36:59 +01:00
Kim Kulling
e792455d66
Remove redundant statement in if
...
- closes https://github.com/assimp/assimp/issues/3180
2021-01-22 14:22:34 +01:00
Kim Kulling
e321367dae
Merge pull request #3602 from assimp/kimkulling-issue3151
...
Update 3DSLoader.cpp
2021-01-22 14:18:20 +01:00
Kim Kulling
dc4514de82
Update COBLoader.cpp
...
Fix cppcheck finding
2021-01-22 13:23:39 +01:00
Kim Kulling
0dcd72d420
Update IFCOpenings.cpp
2021-01-22 13:18:43 +01:00
Kim Kulling
f44572157a
Update 3DSLoader.cpp
2021-01-22 13:14:59 +01:00
Kim Kulling
6293c22c5c
Merge branch 'master' into vs_gitignore_update
2021-01-22 12:59:42 +01:00
Kim Kulling
c9c54822fd
Merge pull request #3594 from xiaohunqupo/master
...
Fix STL Expoter error.
2021-01-22 12:59:18 +01:00
Kim Kulling
f2d3f0dbe6
Merge branch 'master' into master
2021-01-22 12:35:44 +01:00
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
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
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
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
xiaohunqupo
8ba1d38dea
Fix STL Expoter error.
2021-01-20 16:29:30 +08: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