Commit Graph

4709 Commits

Author SHA1 Message Date
Kim Kulling
efa046366e Retrigger build 2020-04-28 09:14:53 +02:00
luca
4488e3e745 build on Linux with gcc and clang; warning as error only for 'assimp' target 2020-04-27 23:38:33 -07:00
luca
d98787f35b CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt; 2020-04-26 12:50:42 -07:00
Kim Kulling
6c1e21d754 fix formatting. 2020-04-26 19:14:30 +02:00
Kim Kulling
bafb8e3189 closes https://github.com/assimp/assimp/issues/3165: remove deprecated code whch causes compiler warning. 2020-04-26 08:59:52 +02:00
Kim Kulling
9b1759dcc2 Merge branch 'master' into migenius-migenius-rsws53-mig-2 2020-04-22 19:59:53 +02:00
Kim Kulling
ca70b44e44 Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2 2020-04-22 19:58:41 +02:00
Kim Kulling
c36b028412 fix type error for template deduction. 2020-04-21 16:39:18 +02:00
Kim Kulling
c91d3764ca Merge branch 'master' into optimized_bonelimits 2020-04-21 08:45:50 +02:00
Kim Kulling
f71b332ed1 Update glTF2Asset.inl
fix VS-compiler warning.
2020-04-19 21:14:47 +02:00
Kim Kulling
e3563212d7 Merge branch 'master' into master 2020-04-19 21:13:12 +02:00
Kim Kulling
e0f6eb09e6 Merge branch 'master' into optimized_bonelimits 2020-04-17 20:37:28 +02:00
Hehongyuanlove
9c52fd7633 Update D3MFExporter.cpp 2020-04-17 12:58:41 +08:00
Hehongyuanlove
e9a72a5053 repair formate 3MF 2020-04-17 12:38:07 +08:00
Hehongyuanlove
3bbc8e76bd Rgba2Hex to repair rgba(1,1,1,1) 2020-04-17 12:34:05 +08:00
Kim Kulling
c0dc26de8e Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-16 11:29:37 +02:00
Kim Kulling
996abd3fbe Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-16 11:08:29 +02:00
Kim Kulling
d12e938a70 Merge branch 'master' into ifdef_export_defines 2020-04-16 10:24:23 +02:00
Kim Kulling
e341eadfd9 Fix typo 2020-04-16 10:23:50 +02:00
Timur Umayev
69f8d47941 glTF2 support targetNames 2020-04-15 09:39:46 +01:00
Max Vollmer (Microsoft Havok)
a14b5fb06f Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-10 08:44:19 +01:00
Max Vollmer (Microsoft Havok)
485d7ab52e Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-10 08:44:18 +01:00
Kim Kulling
79af2b1a5c Merge branch 'master' into kimkulling_dev 2020-04-09 19:55:45 +02:00
Kim Kulling
9a11d91cb8 code reformattings. 2020-04-06 13:33:03 +02:00
Kim Kulling
131aed73b0 closes https://github.com/assimp/assimp/issues/2166: add missing setter for metadata. 2020-04-06 11:16:16 +02:00
Kim Kulling
132ecae6f4 Merge branch 'master' into kimkulling_dev 2020-04-04 18:28:50 +02:00
Max Vollmer (Microsoft Havok)
a07bf8b26f Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-03 08:40:32 +01:00
Max Vollmer (Microsoft Havok)
d966f3394b Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-03 08:40:29 +01:00
Kim Kulling
c21a1ffffa Remove comments to increase readability 2020-04-01 11:16:39 +02:00
Kim Kulling
a7208b02e0 Merge branch 'master' into assimp_gltf2_exporter 2020-04-01 08:42:48 +02:00
Max Vollmer (Microsoft Havok)
54419eb9a0 Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-03-31 09:54:12 +01:00
Max Vollmer (Microsoft Havok)
806d81c919 Merge branch 'master' into GLTF2_recursive_references_fix 2020-03-31 09:54:01 +01:00
Kim Kulling
6973aea6da fix compiler warnings. 2020-03-30 20:41:39 +02:00
Kim Kulling
4c177ad72e fix possible warnings 2020-03-30 20:33:43 +02:00
Kim Kulling
d51b89f3ce trigger build 2020-03-29 13:44:14 +02:00
Kim Kulling
b1165cff28 Merge branch 'master' into kimkulling_dev 2020-03-29 12:07:20 +02:00
Ville Ruusutie
222b145307 Merge branch 'master' into optimized_bonelimits 2020-03-29 12:54:07 +03:00
Kim Kulling
9b83d74830 apply code-conventions to unrealloader 2020-03-28 09:48:55 +01:00
Kim Kulling
27e1a20efe Update 3DSConverter.cpp
Trigger build.
2020-03-27 20:46:32 +01:00
Kim Kulling
3a206a424d Merge branch 'master' into kimkulling_dev 2020-03-27 18:25:13 +01:00
Kim Kulling
e543a58dfb Update m3d.h
fix more alignment errors.
2020-03-27 18:23:22 +01:00
Kim Kulling
2cfdbe2d50 Update m3d.h
Fix alignment bug.
2020-03-27 16:27:07 +01:00
Kim Kulling
7a01061c3e Update m3d.h
Try to fix build error.
2020-03-27 15:39:49 +01:00
Kim Kulling
60750161d5 Update m3d.h
replace assignment by memcpy.
2020-03-27 15:28:32 +01:00
Ville Ruusutie
855452831c Merge branch 'master' into fbx_rotation_fix 2020-03-27 14:36:00 +02:00
Kim Kulling
32c59643f2 Update m3d.h
fix alignment issue.
2020-03-27 11:38:38 +01:00
Kim Kulling
80323b57bc Update UnrealLoader.cpp
Fix static code analysis findings.
2020-03-27 11:30:40 +01:00
Ville Ruusutie
7a2bc5f8f3 Merge branch 'master' into optimized_bonelimits 2020-03-27 07:12:25 +02:00
Ville Ruusutie
69176ad425 Merge branch 'master' into optimized_bonelimits 2020-03-26 21:28:47 +02:00
Ville Ruusutie
7f521b4eb4 Merge branch 'master' into fbx_rotation_fix 2020-03-26 21:28:03 +02:00