4862d11807
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-01 13:25:32 +01:00
d6567e606e
Fixed wrong changes applied during merge.
2020-01-31 18:14:26 -05:00
3386e9ea58
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-31 16:55:45 -05:00
ede860173e
Fixed mValues allocated twice.
...
mValues is already allocated in aiMetadata::Alloc().
2020-01-31 16:43:20 -05:00
9a971ffeac
Merge branch 'master' into master
2020-01-31 19:12:02 +01:00
0269000884
Update glTF2Exporter.cpp
...
Replacing tabs by spaces.
2020-01-31 19:11:36 +01:00
187b74355b
Update glTFImporter.cpp
...
Replace tabs by spaces.
2020-01-31 19:08:04 +01:00
0af44fb3e8
Update glTFExporter.cpp
...
Replacing tabs by spaces.
2020-01-31 19:06:56 +01:00
ca614a7419
Merge branch 'master' into master
2020-01-31 14:29:39 +01:00
e434c63c31
Fixed what kimkulling broke
2020-01-31 14:20:23 +01:00
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
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
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
53c394179c
Merge branch 'master' into refactor-assxml-and-xml-dump-writer
2020-01-30 16:33:24 +01:00
dc01f99fed
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-01-30 09:20:14 +00:00
feeb875453
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-01-30 09:20:08 +00:00
a2ef0b5bd5
Update M3DImporter.cpp
...
Fix some review finding:
- Add missing brackets to make code more readable
- fix scope of variables
2020-01-30 10:00:43 +01:00
605336832f
Update M3DImporter.cpp
...
Add missing brackets
2020-01-30 09:47:39 +01:00
0273ffc367
Merge branch 'master' into master
2020-01-30 09:46:41 +01:00
02ce1d0776
Merge pull request #2880 from assimp/kimkulling-patch-1
...
Update EmbedTexturesProcess.cpp
2020-01-30 09:46:07 +01:00
cb623f8b74
Merge branch 'master' into master
2020-01-29 22:24:48 +01:00
398a8f757e
Additional checks on invalid input
2020-01-29 22:08:34 +01:00
ff168d7bc0
Refactored Assxml exporter and dump xml writer.
...
- Moved AssxmlExporter serialization code in a new file AssxmlFileWriter.cpp/h
- Added new files to CMakeLists.txt
- Replaced string format specifiers %i by %u to match argument type.
- Made a few changes in WriteDumb.cpp to call the new DumpSceneToAssxml function.
2020-01-29 13:44:51 -05:00
9e46fca9a9
Added missing checks for tempData and uvIndices sizes in all cases
2020-01-29 15:06:48 +00:00
0d672efa90
Check input token length before copy
2020-01-29 15:04:26 +00:00
6c95ee145c
Merge branch 'master' into kimkulling-patch-1
2020-01-29 14:37:32 +01:00
194d31002d
Import/export of embedded texture names for the glTF/glTF2 format
2020-01-29 14:04:41 +01:00
26179cd4d2
Merge pull request #2941 from LoicFr/master
...
Fix version revision formatting in glTF metadata
2020-01-29 13:19:01 +01:00
e40df80d0e
Merge branch 'master' into master
2020-01-29 10:57:06 +01:00
0c9c0ab360
Merge pull request #2968 from assimp/issue_1592
...
closes https://github.com/assimp/assimp/issues/1592 :
2020-01-29 10:56:35 +01:00
3ce35074c7
Merge branch 'master' into issue_1592
2020-01-29 08:13:31 +01:00
6c3afe2633
Merge pull request #2967 from malortie/refactor-assbin-export-and-dump-writer
...
Refactored Assbin exporter and assimp_cmd binary serialization functions.
2020-01-29 08:11:32 +01:00
5860d63efc
Update appveyor.yml
...
Disable compilers to improve appveyor build performance
2020-01-28 22:02:29 +01:00
81bc7825d1
Potentially fixed strncpy warning by Coverity.
2020-01-28 14:02:09 -05:00
dd1a11b585
closes https://github.com/assimp/assimp/issues/1592 : make install optional, default enabled.
2020-01-28 19:37:38 +01:00
5f30d4c0f8
Added missing cmd writting.
2020-01-28 12:30:09 -05:00
a328c18286
Fixed "printf format not a literal error" in build.
2020-01-28 11:06:17 -05:00
21edb13ff8
Added missing header for unique_ptr.
2020-01-28 10:55:22 -05:00
20388d6a4f
Refactored Assbin exporter and assimp_cmd binary serialization functions.
...
- Renamed AssimpExport to AssimpFileWriter.
- Moved AssimpFileWriter to it's own file.
- Added a try catch in WriteBinaryDump to fix a case with memory leak.
- Replaced calls to WriteBinaryDump with AssimpFileWriter.
- Added new AssimpFileWriter files to CMakeLists.txt.
2020-01-28 09:55:05 -05:00
27449f17ca
Merge branch 'master' into master
2020-01-28 14:13:29 +01:00
7cad59bf0e
Merge pull request #2943 from malortie/hl1-mdl-fix-texture-format
...
[MDL HL1] Fixed wrong texture format used.
2020-01-28 13:02:18 +01:00
2c430bc82a
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-28 11:13:17 +01:00
6cb2236cf7
Merge pull request #2958 from malortie/assimp-cmd-improved-error-codes
...
Uniformized error codes (return values) in assimp_cmd.
2020-01-28 09:22:32 +01:00
21e4632b99
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-27 18:01:24 -05:00
16d71908d7
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-27 18:01:03 -05:00
26a5c5a8ad
Merge branch 'master' into assimp-cmd-improved-error-codes
2020-01-27 18:00:16 -05:00
e41a59ee1f
Merge pull request #2960 from tellypresence/revert-corrupt-image-files
...
Revert image files corrupted by a8a1ca9
2020-01-27 23:55:31 +01:00
d59ffcb674
Merge branch 'master' into assimp-cmd-improved-error-codes
2020-01-27 20:44:48 +01:00
46faa1e523
Merge branch 'master' into revert-corrupt-image-files
2020-01-27 20:24:17 +01:00
1e3f7137fa
Merge pull request #2962 from RichardTea/macos_rpath
...
Remove explicit setting of macos install_name
2020-01-27 20:21:18 +01:00
Kim Kulling
Marc-Antoine Lortie
Marc-Antoine Lortie
Zoltan Baldaszti
bzt
Hanif Bin Ariffin
Max Vollmer (Microsoft Havok)
Max Vollmer
Loïc
Kim Kulling