Kim Kulling
|
9ebd74bd26
|
Merge branch 'master' into win_dll_so_version
|
2021-11-20 14:16:32 +01:00 |
|
Kim Kulling
|
9267f4c5b8
|
Merge pull request #4184 from RichardTea/deprecated_gltfpbr_macros
Redefine deprecated glTF-specific PBR material macros
|
2021-11-20 14:01:57 +01:00 |
|
Kim Kulling
|
0d857bcf9f
|
Merge branch 'master' into deprecated_gltfpbr_macros
|
2021-11-20 12:35:56 +01:00 |
Ralf Habacker
|
2ceb18746b
|
Append '-SOVERSION' to DLL base file name for mingw builds to match common style
|
2021-11-18 08:17:31 +01:00 |
|
Kim Kulling
|
3db1592f7e
|
Merge pull request #4187 from RichardTea/collada_value_not_attrib_4179
Collada: Read value, not attribute
|
2021-11-17 19:16:10 +01:00 |
RichardTea
|
74b3be194d
|
Read the Value, not the Attribute
Correct some mistakes made when moving to pugixml from IrrXML
Fixes #4179
|
2021-11-17 17:10:10 +00:00 |
|
RichardTea
|
bab8b8dbab
|
apply clangformat
|
2021-11-17 17:08:19 +00:00 |
|
RichardTea
|
33845cd019
|
Only issue compile warning on gcc and msvc
I'm not sure on the proper syntax for clang and mingw
|
2021-11-17 15:44:16 +00:00 |
|
Kim Kulling
|
b1c83f437f
|
Merge pull request #4173 from jdumas/jdumas/ziplib
Do not build ziplib when 3MF exporter is disabled.
|
2021-11-17 14:09:07 +01:00 |
|
Kim Kulling
|
ce3101ea4e
|
Merge branch 'master' into jdumas/ziplib
|
2021-11-17 13:46:16 +01:00 |
|
RichardTea
|
c24f99cd0e
|
Redefine deprecated glTF-specific PBR material macros
Intended to support Qt5 QtQuick3D until it is ported to generic PBR
macros.
|
2021-11-16 11:42:59 +00:00 |
|
Kim Kulling
|
c174575cf8
|
Merge pull request #4181 from assimp/kimkulling-prepare_installer
Update script_x64.iss
|
2021-11-15 11:05:34 +01:00 |
|
Kim Kulling
|
1ee8c1b51f
|
Update script_x86.iss
- Update version for 5.1.0 in x86 installer script
|
2021-11-15 08:41:23 +01:00 |
|
Kim Kulling
|
595799b1bc
|
Update script_x64.iss
- Update to 5.1.0
|
2021-11-15 08:39:31 +01:00 |
|
Kim Kulling
|
a5a091c138
|
Merge pull request #4180 from assimp/kimkulling-remove_irrxml_notes
Delete irrXML_note.txt
|
2021-11-15 08:37:49 +01:00 |
|
Kim Kulling
|
e8732341f4
|
Delete irrXML_note.txt
- Remove deprecated notes from irrxml
|
2021-11-15 08:23:56 +01:00 |
Jérémie Dumas
|
b0d564467e
|
Merge branch 'master' into jdumas/ziplib
|
2021-11-14 08:25:59 -08:00 |
Jérémie Dumas
|
78d72bff59
|
Fix 3MF presence test.
|
2021-11-14 08:24:27 -08:00 |
|
Kim Kulling
|
05115b07b4
|
Merge pull request #4174 from ifree/master
glTF2 skinning related fixes
|
2021-11-13 09:30:32 +01:00 |
|
Kim Kulling
|
b1c336799c
|
Merge branch 'master' into master
|
2021-11-13 09:16:27 +01:00 |
|
Kim Kulling
|
c3ac5569c5
|
Merge branch 'master' into jdumas/ziplib
|
2021-11-13 08:46:46 +01:00 |
|
Kim Kulling
|
4fa3648132
|
Merge pull request #4172 from assimp/kimkulling-diable_m3m_issue-4126
Disable m3d for 5.1
|
2021-11-13 08:45:51 +01:00 |
Kim Kulling
|
f48731622b
|
Disable m3d tesat
|
2021-11-13 08:30:29 +01:00 |
|
Kim Kulling
|
fc0617280e
|
Disable m3d-export
|
2021-11-13 08:16:34 +01:00 |
freizhang
|
b9937994ca
|
Fix glTF2 skinning bone weight exporting issue
|
2021-11-13 12:07:29 +08:00 |
|
freizhang
|
6e6807ee6c
|
Verbose processor bone weight count fix
|
2021-11-13 11:56:15 +08:00 |
|
freizhang
|
1407491a67
|
glTF2 exporter buffer overrun issue fix.
|
2021-11-13 11:52:49 +08:00 |
|
Jérémie Dumas
|
57d22e4dbf
|
Merge branch 'master' into jdumas/ziplib
|
2021-11-12 10:13:21 -08:00 |
|
Kim Kulling
|
159fadebbf
|
Update M3DExporter.cpp
|
2021-11-12 17:53:46 +01:00 |
|
Kim Kulling
|
0beacc3854
|
Merge branch 'master' into kimkulling-diable_m3m_issue-4126
|
2021-11-12 16:02:51 +01:00 |
|
Kim Kulling
|
f03dcc27c0
|
Update M3DExporter.h
|
2021-11-12 15:39:21 +01:00 |
|
Kim Kulling
|
fe73213420
|
Merge pull request #4111 from MalcolmTyrrell/MalcolmTyrrell/jsonSchemaSupport
Allow the gltf2 Importer to optionally use glTF 2.0 JSON schemas for initial validation
|
2021-11-12 13:12:31 +01:00 |
|
Kim Kulling
|
e2ccd17494
|
Fix typo
|
2021-11-12 11:20:22 +01:00 |
|
Kim Kulling
|
157e032bde
|
Fix small findings
- Merge anonymous functions into one block.
- Some reformattings
|
2021-11-12 11:08:19 +01:00 |
|
Kim Kulling
|
37c81e7a28
|
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
|
2021-11-12 10:37:19 +01:00 |
|
Kim Kulling
|
2e5e176bf3
|
Merge pull request #4147 from alpire/master
Fix out-of-bounds read in RemoveLineComments
|
2021-11-12 10:36:44 +01:00 |
|
Kim Kulling
|
c22524351a
|
Merge branch 'master' into master
|
2021-11-12 09:56:56 +01:00 |
|
Kim Kulling
|
97b8e41997
|
Fix formatting
|
2021-11-12 09:56:45 +01:00 |
|
Kim Kulling
|
a7a6b96ca8
|
Merge pull request #4150 from kovacsv/readme_add_assimpjs
Add assimpjs link to the ports in the readme file
|
2021-11-12 09:31:39 +01:00 |
|
Kim Kulling
|
6f853be88c
|
Merge branch 'master' into readme_add_assimpjs
|
2021-11-12 09:18:22 +01:00 |
|
Kim Kulling
|
b43a84a496
|
Merge pull request #4159 from RichardTea/3ds_export_4157
3DS Export: Add support for aiShadingMode_PBR_BRDF
|
2021-11-12 09:17:49 +01:00 |
|
Kim Kulling
|
ece61c6c68
|
Update M3DWrapper.cpp
|
2021-11-12 09:17:32 +01:00 |
|
Kim Kulling
|
608bccd9cf
|
Update M3DWrapper.h
|
2021-11-12 09:13:48 +01:00 |
|
Kim Kulling
|
13731b37c4
|
Merge branch 'master' into 3ds_export_4157
|
2021-11-12 07:06:52 +01:00 |
|
Kim Kulling
|
4abf37ace6
|
Update CMakeLists.txt
|
2021-11-11 23:22:06 +01:00 |
|
Kim Kulling
|
4854978108
|
Disable m3d for 5.1
- closes https://github.com/assimp/assimp/issues/4126
|
2021-11-11 22:15:56 +01:00 |
|
Kim Kulling
|
1f8edd5959
|
Merge pull request #4160 from RichardTea/fix_gltf_warning_4126
Check and limit maximum size of glTF
|
2021-11-11 21:30:07 +01:00 |
|
Kim Kulling
|
43b0ef181a
|
Merge branch 'master' into fix_gltf_warning_4126
|
2021-11-11 20:30:07 +01:00 |
|
Kim Kulling
|
add7f1355e
|
Merge pull request #4163 from RichardTea/fix_aiMesh_abi_4162
Better aiMesh ABI compatibility with 5.0.1, make smaller
|
2021-11-11 20:27:40 +01:00 |
|
Kim Kulling
|
7120504c46
|
Merge branch 'master' into fix_aiMesh_abi_4162
|
2021-11-11 20:02:46 +01:00 |