Max Vollmer
ad278055ae
Added test file and test case for ASCII FBX files with invalid (out of bounds) float values
2020-03-11 12:46:13 +00:00
Kim Kulling
58990d4e3f
Update FBXParser.cpp
...
add missing brackets.
2020-02-10 23:59:52 +01:00
Kim Kulling
5e979d72c9
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-02-10 23:59:13 +01:00
Kim Kulling
c722061f18
Merge pull request #2969 from LoicFr/master
...
Import/export of embedded texture names for the glTF/glTF2 format
2020-02-10 23:58:40 +01:00
Kim Kulling
471f9b23c9
Merge branch 'master' into master
2020-02-10 21:37:01 +01:00
Kim Kulling
c6000db3be
Merge pull request #2994 from iamAdrianIusca/master
...
Small changes in the CMake file
2020-02-10 21:07:52 +01:00
Kim Kulling
d38e541e89
Merge branch 'master' into master
2020-02-09 20:43:12 +01:00
Kim Kulling
91633dc437
Merge pull request #2987 from Frooxius/master
...
Fixed population of bone armature and node fields for some meshes
2020-02-09 20:42:30 +01:00
iamAdrianIusca
ca08cbcb0c
- don't include HunterGate.cmake if you don't enable HUNTER package manager
...
- don't check for DirectX if you don't build the assimp tools or samples
2020-02-09 20:31:06 +02:00
Kim Kulling
8fd053315c
Update ArmaturePopulate.cpp
...
- Introduce tabs width of 4.
- Add missing brackets
- Use c++ comment blocks
2020-02-09 11:14:42 +01:00
Kim Kulling
407c550240
Merge branch 'master' into master
2020-02-09 11:05:35 +01:00
Kim Kulling
5a674bb464
Merge pull request #2989 from malortie/multiple-texture-type-to-string-definitions
...
Fixed TextureTypeToString defined multiple times.
2020-02-09 11:05:08 +01:00
Marc-Antoine Lortie
95a7772b5a
Merge branch 'master' into multiple-texture-type-to-string-definitions
2020-02-07 17:37:10 -05:00
Kim Kulling
af9705e3d1
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-02-07 11:52:00 +01:00
Kim Kulling
97a6d80cb1
Merge pull request #2990 from assimp/kimkulling-sponoring-update-1
...
Update FUNDING.yml
2020-02-07 11:51:37 +01:00
Kim Kulling
d3a70c73c4
Update FUNDING.yml
...
Add paypal sponsoring
2020-02-07 10:58:56 +01:00
Tomas Mariancik
acf57bdb13
Merge branch 'master' into master
2020-02-06 22:58:19 +01:00
Marc-Antoine Lortie
8c09cd2ef3
Fixed TextureTypeToString defined multiple times.
...
- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 missing values in TextureTypeToString.
- Added 6 missing aiTextureType enum values in assimp_cmd/Info.cpp.
2020-02-06 13:19:01 -05:00
Kim Kulling
355131e261
Merge pull request #2942 from malortie/hl1-mdl-remove-texture-256-clamping-2
...
[MDL HL1] Removed texture dimensions limitation.
2020-02-06 17:24:01 +01:00
Kim Kulling
b33272b1c8
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-02-06 14:39:09 +01:00
Frooxius
29603128f4
Fixed invalid armature node population when there's mesh on a node with the same name as the bone
2020-02-06 10:28:38 +01:00
Tomas Mariancik
cb02e2fc65
Merge pull request #4 from assimp/master
...
Updating to the latest version from upstream
2020-02-06 08:26:57 +01:00
Kim Kulling
fa60ae2885
Merge pull request #2974 from malortie/rename-writedumb-to-writedump
...
Renamed WriteDumb.cpp to WriteDump.cpp
2020-02-05 17:42:55 +01:00
Kim Kulling
f00256d185
Merge branch 'master' into rename-writedumb-to-writedump
2020-02-05 13:58:09 +01:00
Kim Kulling
f7c59ace44
Merge pull request #2984 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix
...
Removed unnecessary checks that may result in false positives rejecting valid models.
2020-02-05 13:57:40 +01:00
Max Vollmer (Microsoft Havok)
eb1d25631b
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-05 11:12:57 +00:00
Max Vollmer
ec024085ab
Merge branch 'FBXMeshGeometry_checksizes_fix' of https://github.com/ms-maxvollmer/assimp into FBXMeshGeometry_checksizes_fix
2020-02-05 11:08:00 +00:00
Max Vollmer
cb55e2658d
Removed unnecessary checks that may result in false positives rejecting valid models
2020-02-05 11:07:39 +00:00
Kim Kulling
c9244a4ae3
Merge pull request #2976 from hbina/fix_clang_warnings
...
Fixed a bunch of clang warnings
2020-02-03 21:20:12 +01:00
Kim Kulling
ad286a8ab1
Merge branch 'master' into fix_clang_warnings
2020-02-03 19:07:02 +01:00
Kim Kulling
8e009c3d0c
Update MDLLoader.cpp
...
fix a tab.
2020-02-03 19:06:36 +01:00
Kim Kulling
c0dc3b3f58
Merge pull request #2978 from malortie/scene-combiner-memory-leak
...
Fixed mValues allocated twice in SceneCombiner.cpp.
2020-02-03 19:02:36 +01:00
Kim Kulling
2d5c28ac46
Merge branch 'master' into scene-combiner-memory-leak
2020-02-02 20:43:52 +01:00
Kim Kulling
99175e3eaf
Merge branch 'master' into master
2020-02-01 19:26:52 +01:00
Kim Kulling
5eb040c744
Merge pull request #2970 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix
...
Added missing checks for tempData and uvIndices sizes in all cases
2020-02-01 19:24:54 +01:00
Kim Kulling
4862d11807
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-01 13:25:32 +01:00
Marc-Antoine Lortie
d6567e606e
Fixed wrong changes applied during merge.
2020-01-31 18:14:26 -05:00
Marc-Antoine Lortie
3386e9ea58
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-31 16:55:45 -05:00
Marc-Antoine Lortie
ede860173e
Fixed mValues allocated twice.
...
mValues is already allocated in aiMetadata::Alloc().
2020-01-31 16:43:20 -05:00
Kim Kulling
9a971ffeac
Merge branch 'master' into master
2020-01-31 19:12:02 +01:00
Kim Kulling
0269000884
Update glTF2Exporter.cpp
...
Replacing tabs by spaces.
2020-01-31 19:11:36 +01:00
Kim Kulling
187b74355b
Update glTFImporter.cpp
...
Replace tabs by spaces.
2020-01-31 19:08:04 +01:00
Kim Kulling
0af44fb3e8
Update glTFExporter.cpp
...
Replacing tabs by spaces.
2020-01-31 19:06:56 +01:00
Hanif Bin Ariffin
bbe6f7f213
Fixed a bunch of clang warnings
...
1. Fix misleading indentation warnings.
2. Fix creating a temporary const copy when iterating over a map (thanks to range analysis warnings)
3. Fix creating a copy when iterating over a range without reference qualifier (also thanks to range analysis warnings)
2020-01-30 18:42:30 -05:00
Marc-Antoine Lortie
2c1c1d846e
Renamed WriteDumb.cpp to WriteDump.cpp
...
This includes as well changes to places referencing WriteDumb.cpp.
2020-01-30 16:40:34 -05:00
Kim Kulling
78b074ac5a
Merge pull request #2972 from malortie/refactor-assxml-and-xml-dump-writer
...
Refactored Assxml exporter and dump xml writer.
2020-01-30 20:55:19 +01:00
Kim Kulling
53c394179c
Merge branch 'master' into refactor-assxml-and-xml-dump-writer
2020-01-30 16:33:24 +01:00
Max Vollmer (Microsoft Havok)
dc01f99fed
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-01-30 09:20:14 +00:00
Max Vollmer (Microsoft Havok)
feeb875453
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-01-30 09:20:08 +00:00
Kim Kulling
02ce1d0776
Merge pull request #2880 from assimp/kimkulling-patch-1
...
Update EmbedTexturesProcess.cpp
2020-01-30 09:46:07 +01:00