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 |
|
Kim Kulling
|
0a165ee666
|
Merge pull request #3311 from ms-maxvollmer/gltf1_gltf2_split
Added macros to enable/disable GLTF1 and GLTF2 independently
|
2020-07-16 21:37:08 +02:00 |
Kim Kulling
|
deddaf49df
|
finish migrate ogrexmlserializer.
|
2020-07-16 11:33:28 +02:00 |
|
Kim Kulling
|
df8792d24b
|
Merge branch 'master' into gltf1_gltf2_split
|
2020-07-16 10:45:55 +02:00 |
|
Kim Kulling
|
44fd987d57
|
Merge pull request #3330 from infosia/bad_nodeanim_ptr
fix invalid pointer for bone animation
|
2020-07-16 10:39:21 +02:00 |
Kota Iguchi
|
84e68eaf24
|
fix invalid pointer for bone animation
|
2020-07-16 15:26:02 +09:00 |
Malcolm Tyrrell
|
04df5f8b1e
|
Don't use make_unique
|
2020-07-15 15:47:25 +01:00 |
|
Malcolm Tyrrell
|
e51e07982d
|
Remove generic lambda usage.
|
2020-07-15 15:05:42 +01:00 |
|
Malcolm Tyrrell
|
e1bab44e19
|
Exception safety
|
2020-07-15 15:02:27 +01:00 |
|
Malcolm Tyrrell
|
37e1fb9cd7
|
Fix message
|
2020-07-15 14:19:13 +01:00 |
|
Malcolm Tyrrell
|
f3170a96ba
|
Ensure data does not depend on faces we may not have created.
|
2020-07-15 12:36:48 +01:00 |
|
Malcolm Tyrrell
|
d4f5f29b44
|
Add missing asset
|
2020-07-15 12:22:39 +01:00 |
|
Malcolm Tyrrell
|
fff6396e3c
|
Rename to avoid overloading problems.
|
2020-07-15 12:22:28 +01:00 |
|
Malcolm Tyrrell
|
212903e935
|
Unit test for all indices out of range, and fix.
|
2020-07-15 12:19:00 +01:00 |
|
Malcolm Tyrrell
|
7e7161852a
|
Add a unit test.
|
2020-07-15 11:19:10 +01:00 |
|
Malcolm Tyrrell
|
c0d978786e
|
Fix warning
|
2020-07-15 09:12:52 +01:00 |
|
Malcolm Tyrrell
|
a56134ba33
|
Drop faces when indices are out of range.
|
2020-07-15 09:05:09 +01:00 |
awr1
|
77cf6e3433
|
Ensure that zip.h warning disable is pushed
|
2020-07-14 22:07:24 -05:00 |
|
awr1
|
638369e995
|
Try to fix lexing issue with preproc w/r/t __has_warning
|
2020-07-14 21:58:36 -05:00 |
|
awr1
|
cc8cd88d7a
|
Preproc conditional should be &&, not ||
|
2020-07-14 21:50:22 -05:00 |