Kim Kulling
5e0b9e0f32
Remove travix + assveyor.
2020-07-23 11:35:36 +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
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
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
Rahul Sheth
0bad2c7b6a
Move library configuration outside Hunter block
2020-07-14 19:00:42 -04:00
Rahul Sheth
abc6b9ce4c
ifdef fixes to fix MSVC warnings
2020-07-14 19:00:38 -04:00
Rahul Sheth
209a61d0e7
Update hunter and utf8cpp inclusion
2020-07-14 19:00:23 -04:00
Ryan Styrczula
84e342acd7
DefaultIOStream: Remove assert on empty count
...
fwrite() is valid to call with a 0 count, and will simply return 0.
See:
https://en.cppreference.com/w/cpp/io/c/fwrite
http://www.cplusplus.com/reference/cstdio/fwrite/
There are code paths where StreamWriter will call Tell(), which calls
Flush(), which calls Write(buffer.data(), 1, buffer.size()). This can
happen when nothing has yet been written to the buffer, so size is 0.
2020-07-14 10:39:18 -04:00
Kim Kulling
67a710efad
Merge pull request #3320 from IOBYTE/master
...
add triangle strip support to AC file loader
2020-07-13 22:10:12 +02:00
Kim Kulling
f5d5d7c5ed
Merge branch 'master' into master
2020-07-13 20:35:24 +02:00
Kim Kulling
bdcad5cd0a
Merge pull request #3292 from rmstyrczula/master
...
FBXExporter: Use scene metadata for global settings
2020-07-13 20:32:44 +02:00
Ryan Styrczula
0c2f7a119c
FBXExporter: Forgot WritePropColor defaultValue
2020-07-13 13:56:06 -04:00
Ryan Styrczula
6619ec8253
FBXExporter: Use scene metadata for global settings
...
Models with non-standard axes and scale are not imported and exported
correctly if the input metadata is ignored.
2020-07-13 13:56:06 -04:00
Kim Kulling
aff5bba9da
Merge pull request #3289 from ifiddynine/patch-1
...
Fix Blender .fbx metalness detection
2020-07-12 19:05:55 +02:00
Kim Kulling
78d0b81b6c
Merge branch 'master' into patch-1
2020-07-12 18:54:34 +02:00
Kim Kulling
411bf89b64
Merge pull request #3323 from assimp/LoicFr-master
...
Loic fr master
2020-07-12 18:52:38 +02:00
Kim Kulling
eaac92830a
Merge branch 'master' of https://github.com/LoicFr/assimp into LoicFr-master
2020-07-12 12:05:34 +02:00
Andrew Johnson
a9a0c30932
Build viewer and publish artifacts on windows-msvc.
...
This commit introduces Github Actions support for building the tools and viewer and making
these available for download as a zip file in the artifacts area of the Github Actions page.
This allows for continuous validation that the viewer and tools build successfully, and
the download is useful for quick testing of the very latest assimp functionality without needing
to download and build it from source.
This only applies to windows-msvc, since the assimp viewer is only supported on that platform.
It downloads the June 2010 DirectX SDK from the Microsoft servers and installs it. It also
uses a cache to prevent having to perform this DX SDK download and installation repeatedly for every
commit.
Note, it's necessary install the older June 2010 DXSDK because assimp uses the now deprecated D3DX libraries,
and these libraries are not included in the stock Windows Server image provided by Github Actions.
2020-07-11 22:05:06 -07:00
Kim Kulling
231447c8d6
Merge pull request #3227 from thomasbiang/gltf2_sparseAccessor_export
...
Gltf2 Sparse Accessor Export (blendshape export using sparse accessor)
2020-07-11 23:06:47 +02:00
Kim Kulling
b1dd77fbbc
Merge branch 'master' into gltf2_sparseAccessor_export
2020-07-11 22:57:31 +02:00
Kim Kulling
ec156e4da3
Merge pull request #3280 from thomasbiang/extras_property_callback
...
Customize Extras in Gltf2 Exporter with ExporterProperty Callback
2020-07-11 22:56:38 +02:00
Kim Kulling
306e03d497
Merge branch 'master' into extras_property_callback
2020-07-11 22:46:19 +02:00
Kim Kulling
108b3a62e5
Update Exporter.hpp
...
revert merge issue
2020-07-11 22:45:45 +02:00
Kim Kulling
1324b4b27d
Merge pull request #3321 from assimp/kimkulling-patch-7
...
use c-style cast in a c-file
2020-07-11 22:43:44 +02:00