Commit Graph

9504 Commits (fa24e4199c1da5e77230de521e215b87f8f5caeb)

Author SHA1 Message Date
Kim Kulling ac8a8a5ad4
Merge pull request #3349 from rmstyrczula/fixFbxExportNullptr
FBXExport: Fix crash if scene->mMetaData is null
2020-07-31 14:32:32 +02:00
Malcolm Tyrrell 0282f358a4 Remove unneeded check. 2020-07-31 12:40:17 +01:00
Malcolm Tyrrell 301bae3967 Improve message 2020-07-30 16:37:41 +01:00
Malcolm Tyrrell eaf0587dd8 FBX Version/Size Check 2020-07-30 14:56:01 +01:00
Ryan Styrczula 3170c3d15c FBXExport: Fix crash if scene->mMetaData is null 2020-07-30 09:21:43 -04:00
Kim Kulling 58b81a2590 start migrating X3D. 2020-07-26 10:17:21 +02:00
Kim Kulling 575ce6136d
Merge pull request #3347 from rbsheth/rbsheth_fix_warn
Fixing more build warnings
2020-07-25 19:06:21 +02:00
Rahul Sheth ad18e365e5 Fixing more warnings 2020-07-24 16:33:36 -04:00
Kim Kulling 6828cf2f03
Merge pull request #3328 from awr1/fix-mingw-priumax
Fix MinGW builds (issues related to pragmas and format strings)
2020-07-24 11:34:25 +02:00
Kim Kulling c7a9ef30cc
Merge branch 'master' into fix-mingw-priumax 2020-07-24 11:14:15 +02:00
Kim Kulling e8cbc0928e
Merge pull request #3346 from assimp/fix_compiler_warnings
Fix warning: comparison between unsigned and signed.
2020-07-24 11:11:39 +02:00
Kim Kulling 6886ea6c65 Fix warning: comparison between unsigned and signed. 2020-07-24 10:57:24 +02:00
Kim Kulling 59e15b7fd1
Merge pull request #3345 from assimp/fix_include
add missing include for logging.
2020-07-23 21:37:00 +02:00
Kim Kulling c62fa76cda
Merge branch 'master' into fix_include 2020-07-23 21:09:11 +02:00
Kim Kulling dcc8419722 add missing include for logging. 2020-07-23 21:01:08 +02:00
Kim Kulling 07c1396b50
Merge pull request #3344 from assimp/fix_include
use correct include.
2020-07-23 20:26:56 +02:00
Kim Kulling 9a4b3fd9de use correct include. 2020-07-23 20:16:11 +02:00
Kim Kulling 8edb0d5278
Merge pull request #3343 from assimp/fix_assimp_fuzzing
fix namespace issue in fuzzer.
2020-07-23 20:08:17 +02:00
Kim Kulling eb44eb13e6 fix namespace issue in fuzzer. 2020-07-23 19:15:46 +02:00
Kim Kulling c67a5bd903
Merge pull request #3342 from assimp/kimkulling-patch-7
Remove travis + assveyor.
2020-07-23 12:00:10 +02:00
Kim Kulling b2df27a6f0
Merge branch 'master' into kimkulling-patch-7 2020-07-23 11:46:33 +02:00
Kim Kulling c71dbcc37e
Merge pull request #3329 from MalcolmTyrrell/gltfIndexOutOfRangeFix
Handle Gltf2 files where a value in a mesh index buffer is out of range.
2020-07-23 11:43:39 +02:00
Kim Kulling 5e0b9e0f32
Remove travix + assveyor. 2020-07-23 11:35:36 +02:00
Kim Kulling 0f442b1ff2
Merge branch 'master' into gltfIndexOutOfRangeFix 2020-07-23 11:27:34 +02:00
Kim Kulling 52c29612f7
Merge pull request #3333 from RichardTea/acloader_enums
ACLoader: Use Surface type enums
2020-07-23 11:27:07 +02:00
Kim Kulling a33557be71
Merge branch 'master' into acloader_enums 2020-07-22 23:50:51 +02:00
Kim Kulling ac83e3593e
Merge pull request #3335 from RichardTea/issue-3334_cl_D9025
Issue 3334 cl d9025
2020-07-22 23:50:12 +02:00
Kim Kulling 162c8be184
Merge branch 'master' into issue-3334_cl_D9025 2020-07-22 22:57:14 +02:00
Kim Kulling a2186a0553
Merge pull request #3336 from RichardTea/issue-3332_msvc2017
Use #ifdef _MSC_VER for pragma warnings (Issue 3332)
2020-07-21 00:40:05 +02:00
Kim Kulling 76a6bb36f6
Merge branch 'master' into issue-3332_msvc2017 2020-07-20 22:04:35 +02:00
Kim Kulling 6a9ca736c1
Merge pull request #3337 from MeyerFabian/build/clang-cl-windows
clang with msvc backend
2020-07-20 21:04:55 +02:00
MeyerFabian 51e592123a Fix two deletions. 2020-07-20 18:42:57 +02:00
MeyerFabian a19e4e4112 Make clang with msvc abi work. 2020-07-20 18:28:50 +02:00
MeyerFabian 13ee2306c3 build/clang-cl-windows 2020-07-20 17:04:11 +02:00
RichardTea 9cad10a995 Disable MSVC warnings on all MSVC
Fixes the build on MSVC 2017 (and probably MSVC 2015)
2020-07-17 14:58:51 +01:00
RichardTea a4eceb7b3f Set CMP0092 the other way 2020-07-17 12:06:52 +01:00
RichardTea c527a33aa8 Merge remote-tracking branch 'upstream/master' 2020-07-17 12:00:38 +01:00
RichardTea ef37fc4632
Merge branch 'master' into issue-3334_cl_D9025 2020-07-17 11:59:53 +01:00
RichardTea ce133e5add Set CMake policy CMP0092
Disable cmake's automatic /W3 for MSVC
2020-07-17 11:58:17 +01:00
RichardTea f2e3e43fbc
Merge branch 'master' into acloader_enums 2020-07-17 11:30:50 +01:00
RichardTea 17b9403b7a ACLoader: Use enum for Surface flags 2020-07-17 11:23:50 +01:00
Kim Kulling b2e53783de
Merge branch 'master' into fix-mingw-priumax 2020-07-17 12:07:46 +02:00
Kim Kulling 37056f0242
Merge pull request #3327 from rbsheth/rbsheth_update_hunter
Hunter-related build fixes
2020-07-17 12:02:28 +02:00
Kim Kulling fa486240d5
Merge branch 'master' into rbsheth_update_hunter 2020-07-17 11:39:55 +02:00
Kim Kulling 1975579268
Merge pull request #3326 from rmstyrczula/master
DefaultIOStream: Remove assert on empty count
2020-07-17 11:33:02 +02:00
RichardTea 719cc82a1f Apply clangformat 2020-07-17 10:29:44 +01:00
RichardTea 8c60879485 Rollup to 'upstream/master' 2020-07-17 10:03:48 +01:00
Kim Kulling 516bdc2a4b
Merge branch 'master' into master 2020-07-16 22:48:02 +02:00
Kim Kulling c55ca47666
Merge pull request #3322 from AndrewJDR/master
Build viewer and publish artifacts on windows-msvc.
2020-07-16 22:47:17 +02:00
Kim Kulling 147c5f7cd2
Merge branch 'master' into master 2020-07-16 21:37:46 +02:00