Kim Kulling
5adea2dbcf
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-11 21:40:44 +02:00
Kim Kulling
aaa19903c6
Fix merge conflicts
2022-06-11 18:50:18 +02:00
naveen
a5a38775f1
chore: Included githubactions in the dependabot config
...
This should help with keeping the GitHub actions updated on new releases. This will also help with keeping it secure.
Dependabot helps in keeping the supply chain secure https://docs.github.com/en/code-security/dependabot
GitHub actions up to date https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
https://github.com/ossf/scorecard/blob/main/docs/checks.md#dependency-update-tool
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-06-10 01:30:07 +00:00
Kim Kulling
0768a13057
Merge pull request #4567 from assimp/kimkulling/fix_nullptr_exception_opnglb_export_issue4418
...
Fix possible nullptr exception
2022-06-08 08:13:16 +02:00
Kim Kulling
02b0c89fa4
Fix usage of validation
2022-06-08 00:10:13 +02:00
Kim Kulling
4fb5cf4ba6
Fix possible nullptr exception
...
- closes https://github.com/assimp/assimp/issues/4418
2022-06-07 23:33:56 +02:00
Kim Kulling
34cb936844
Merge pull request #4546 from matthewclendening/fix_FBXConverter_double_precision
...
Fixed FBXConverter build error when using double precision
2022-06-07 22:30:33 +02:00
Kim Kulling
b9fdf6d3ca
Merge branch 'master' into fix_FBXConverter_double_precision
2022-06-07 22:08:56 +02:00
Kim Kulling
bc2786d830
Merge pull request #4564 from ethaninfinity/master
...
Pragma warnings cause build fail with MinGW
2022-06-07 22:08:03 +02:00
Kim Kulling
e7daa5759b
Merge branch 'master' into master
2022-06-07 22:01:00 +02:00
Kim Kulling
7a64f751ab
Merge branch 'master' into master
2022-06-07 21:29:33 +02:00
Kim Kulling
988b5c1f36
Merge pull request #4565 from assimp/kimkulling-create-security-vulnerability
...
Create SECURITY.md
2022-06-07 21:10:44 +02:00
Kim Kulling
096aee2c25
Create SECURITY.md
...
- Prepare a first contact point for security vulnerability
2022-06-07 20:58:45 +02:00
ethaninfinity
d018c3b555
Added back pragma warnings and changed to be MSVC-specific
2022-06-07 11:42:09 -04:00
ethaninfinity
c5b6b26b8b
Revert "Removed pragma warnings"
...
This reverts commit 4961241c09
.
2022-06-07 11:27:12 -04:00
ethaninfinity
4961241c09
Removed pragma warnings
2022-06-06 14:53:03 -04:00
Matthew Clendening
aca02190a7
Merge branch 'master' into fix_FBXConverter_double_precision
2022-06-06 10:01:13 -04:00
Kim Kulling
49fdd12fdf
Merge pull request #4554 from Nor-s/fix_fbx
...
Fix Import a specific FBX model will freeze the app #4395
2022-06-03 13:48:35 +02:00
Kim Kulling
680ea6b0e0
Merge branch 'master' into fix_fbx
2022-06-03 11:21:41 +02:00
Kim Kulling
39a4627519
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015
2022-06-02 21:47:29 +02:00
Kim Kulling
530ae2b192
Merge pull request #4555 from Underdisc/issue4516
...
Remove dllexport tags from static library builds.
2022-06-02 20:01:51 +02:00
Kim Kulling
638fda66da
Merge branch 'master' into issue4516
2022-06-01 20:47:13 +02:00
nsg
96d2052ed0
Merge branch 'master' into fix_fbx
2022-06-02 02:31:32 +09:00
Kim Kulling
7fcd961a20
Merge pull request #4549 from Gargaj/msvcfix
...
fix msvc warnings-as-errors
2022-06-01 17:39:01 +02:00
Kim Kulling
03532eaec3
Merge branch 'master' into msvcfix
2022-06-01 17:11:06 +02:00
Underdisc
17289985a4
Update comment
2022-06-01 12:45:40 +02:00
Underdisc
02e0d1d05c
Remove dllexport tags from static library builds.
2022-06-01 12:26:04 +02:00
nsg
681eb3e91e
Fix Import a specific FBX model
2022-06-01 17:41:27 +09:00
Kim Kulling
2e944686f8
Merge pull request #4478 from assimp/kimkulling/link_stb_image_statically_issue_4467
...
Link static linkage for std_image.
2022-06-01 00:01:00 +02:00
Kim Kulling
b7a70ac707
Add compiler switgxh for using static linkage for std_image
2022-05-31 23:24:31 +02:00
Kim Kulling
43c767dd62
Merge branch 'master' into msvcfix
2022-05-31 22:06:57 +02:00
Kim Kulling
05867f4752
Merge branch 'kimkulling/link_stb_image_statically_issue_4467' of https://github.com/assimp/assimp into kimkulling/link_stb_image_statically_issue_4467
2022-05-31 20:08:39 +02:00
Kim Kulling
de4fe01c94
Fix clang build
2022-05-31 20:08:26 +02:00
Kim Kulling
e28becbaf5
Update Assimp.cpp
2022-05-31 19:17:08 +02:00
Kim Kulling
e5cd85ac0c
Update M3DWrapper.h
2022-05-31 19:16:46 +02:00
Kim Kulling
4b25eb6c4b
Update Assimp.cpp
2022-05-31 19:09:22 +02:00
Kim Kulling
c0e141a6a9
Update StbCommon.h
2022-05-31 19:08:46 +02:00
Kim Kulling
b00923ebcd
Update Assimp.cpp
2022-05-31 19:08:29 +02:00
Kim Kulling
4e22635406
Update PbrtExporter.cpp
2022-05-31 18:31:19 +02:00
Kim Kulling
472e15c405
Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467
2022-05-31 17:47:43 +02:00
Kim Kulling
4b923f0603
Merge pull request #4537 from assimp/kimkulling/fix_compiler_warning
...
Cleanups
2022-05-31 17:47:21 +02:00
Kim Kulling
234e55fbb1
Use size_t
2022-05-31 07:29:54 +02:00
Gargaj
f612865f22
fix msvc warnings-as-errors
2022-05-29 01:35:48 +02:00
Matthew Clendening
26233f1b77
Fixed FBXConverter build error (warning as error) when ASSIMP_DOUBLE_PRECISION is defined
2022-05-26 15:06:23 -04:00
hgdagon
efbcdccac9
Fix GNUC check on Windows (2nd attempt)
2022-05-25 09:18:42 -07:00
hgdagon
affa85a36b
Fix GNUC check on Windows
2022-05-25 07:59:01 -07:00
Kim Kulling
ed3e218550
Bugfix: fix not initialized member attributes
2022-05-21 19:08:43 +02:00
Kim Kulling
e0696486b2
Update gtest
2022-05-21 11:09:46 +02:00
Kim Kulling
e5a2b00719
Fix comparison signed unsigned warning.
2022-05-21 09:47:54 +02:00
tanolino
002d6dc016
Inifinite loop on bad import files
...
I had an import file that caused an infinite loop. I don't exactly know how this algorithm works here but maybe we should change it more.
Probably calculate the amount of steps and chop linear.
2022-05-18 15:22:11 +02:00