Commit Graph

9988 Commits

Author SHA1 Message Date
Kim Kulling
9395322e56 Delete AssimpLog_C.txt 2021-05-05 15:10:22 +02:00
kkulling
2a6b84c8ea - closes https://github.com/assimp/assimp/issues/3830
- Fix rgba2hex
- Add tests
2021-05-05 14:43:51 +02:00
kkulling
f15dcfa981 - Fix model parsing 2021-05-05 13:10:52 +02:00
kkulling
cbce6d3dad Merge branch 'optimize_3mf_strings' of https://github.com/assimp/assimp into optimize_3mf_strings 2021-05-05 10:46:54 +02:00
Kim Kulling
e85a69a960 Update D3MFImporter.cpp 2021-05-04 15:31:07 +02:00
kimkulling
7690f92c81 Fix version of strnlen 2021-05-04 14:48:39 +02:00
Kim Kulling
47cacf8aa6 Merge branch 'master' into optimize_3mf_strings 2021-05-04 14:42:16 +02:00
kimkulling
ee5170c18a - fix security issue 2021-05-04 14:40:25 +02:00
Kim Kulling
ff18354997 Merge pull request #3869 from assimp/optimize_3mf_strings
use const chars
2021-05-04 12:46:38 +02:00
kimkulling
0e17939e8d Use const char* const 2021-05-04 12:09:38 +02:00
Kim Kulling
33a85e280f Merge branch 'master' into optimize_3mf_strings 2021-05-04 11:47:11 +02:00
kkulling
55fd820ed7 use const chars 2021-05-04 10:57:30 +02:00
Kim Kulling
70ba2e9e74 Merge pull request #3805 from krishty/fix-scale-msg
fixed malformatted message
2021-05-04 09:18:12 +02:00
Kim Kulling
39522178aa Merge branch 'master' into fix-scale-msg 2021-05-04 08:13:12 +02:00
Kim Kulling
79802ad836 Merge pull request #3796 from krishty/fix-file-detection
small cleanup in file format detection
2021-05-04 07:54:09 +02:00
Kim Kulling
f29828f657 Merge branch 'master' into fix-file-detection 2021-05-02 19:41:33 +02:00
Kim Kulling
71c48581f3 Merge pull request #3852 from krishty/3ds-namespace
style fix: namespace instead of class with public static members
2021-05-02 19:41:04 +02:00
Kim Kulling
9e27afe353 Merge branch 'master' into 3ds-namespace 2021-05-02 17:38:29 +02:00
Kim Kulling
afdec791a6 Merge pull request #3795 from assimp/kimkulling-patch-3
Fix formatter.
2021-05-02 17:38:16 +02:00
Kim Kulling
e278673fe7 Merge branch 'master' into 3ds-namespace 2021-05-02 15:08:11 +02:00
Krishty
e73a2ed5e0 style fix: namespace instead of class with public static members 2021-05-01 23:20:37 +02:00
Kim Kulling
6c429a9d82 Merge branch 'master' into kimkulling-patch-3 2021-05-01 19:29:37 +02:00
Kim Kulling
b516d940b6 Merge pull request #3826 from krishty/fix-3ds-matrix
reverted regression in 3DS transformation (issue #3802)
2021-05-01 12:02:24 +02:00
Kim Kulling
78132d666f Merge branch 'master' into fix-3ds-matrix 2021-05-01 11:34:33 +02:00
Kim Kulling
f538b96e82 Merge pull request #3788 from BaldricS/SceneCombiner_Memory_Leaks
Fix: Removing double delete of texture items after MergeScene.
2021-05-01 11:07:34 +02:00
Kim Kulling
7843b24e03 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-05-01 09:16:06 +02:00
Kim Kulling
d28e2e0a39 Merge pull request #3775 from diiigle/patch-1
Add PBRT to exportable file formats list
2021-05-01 09:15:34 +02:00
Kim Kulling
2d51efa002 Merge branch 'master' into patch-1 2021-04-30 21:14:26 +02:00
Kim Kulling
911321b97b Merge pull request #3765 from krishty/md2-mdc-const
moved MD2/MDC tables from BSS to const data
2021-04-30 21:12:36 +02:00
Kim Kulling
2feda5b4b2 Merge branch 'master' into md2-mdc-const 2021-04-30 20:10:45 +02:00
Kim Kulling
9b36f62cb2 Merge pull request #3764 from krishty/empty-string-style
style fix - initializing and assigning empty std::string properly
2021-04-30 20:10:18 +02:00
Kim Kulling
60f030ccbc Merge branch 'master' into empty-string-style 2021-04-30 19:50:38 +02:00
Kim Kulling
9ef84a67f7 Merge pull request #3846 from assimp/issue_3831_update_zip
closes https://github.com/assimp/assimp/issues/3831 : update zip
2021-04-30 18:00:55 +02:00
Kim Kulling
feeb89a1dd closes https://github.com/assimp/assimp/issues/3831 : update zip 2021-04-30 16:49:15 +02:00
Kim Kulling
57091d761e Merge branch 'master' into md2-mdc-const 2021-04-30 00:56:50 +02:00
Kim Kulling
0b92abe9b4 Merge branch 'master' into empty-string-style 2021-04-30 00:54:57 +02:00
Scott Baldric
f523b1e0d7 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-29 08:52:51 -05:00
Kim Kulling
96d0524fab Merge pull request #3787 from ms-maxvollmer/ms-maxvollmer/importer_fixes
Importer improvements
2021-04-28 20:42:06 +02:00
Kim Kulling
41e5acf060 Merge branch 'master' into ms-maxvollmer/importer_fixes 2021-04-28 20:26:38 +02:00
Kim Kulling
7dd870f88c Merge pull request #3833 from assimp/kimkulling-fix_debug_crash
Fix crash when reading 0 bytes
2021-04-28 20:26:30 +02:00
Kim Kulling
9a0b703db1 Merge branch 'master' into ms-maxvollmer/importer_fixes 2021-04-28 20:25:10 +02:00
Kim Kulling
6abdd0cd3e Fix crash when reading 0 bytes
- This is a valid option so crash shall not happen
2021-04-28 16:38:22 +02:00
Scott Baldric
8e3fe6b30b Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-28 09:16:02 -05:00
Krishty
260cc6bd26 reverted regression in 3DS transformation (issue #3802)
The regression was introduced to align 3DS export and import, but in fact it broke the transformation matrices on import. This commit reverts the relevant lines. Furthermore, matrix layout was double-checked with two other 3DS importers. Export was not considered.
2021-04-28 01:02:24 +02:00
Kim Kulling
74577ae3c7 Merge pull request #3822 from JC3/patch-2
Remove newline from name of Blender importer.
2021-04-27 22:08:06 +02:00
Kim Kulling
30f55dcbbf Merge branch 'master' into patch-2 2021-04-27 20:30:06 +02:00
Kim Kulling
9504957534 Merge pull request #3821 from JC3/patch-1
Update aiProcess_PreTransformVertices docs to match behavior.
2021-04-27 20:29:21 +02:00
Jason C
3acd42c22e Remove newline from name of Blender importer.
Addresses #3797.

Re-submitting this as a quick fix to the immediate issue while I think about the website field.
2021-04-26 20:27:28 -04:00
Jason C
708d124745 Update aiProcess_PreTransformVertices docs to match behavior.
Addresses #3820, the easy way.
2021-04-26 19:42:22 -04:00
Max Vollmer (Microsoft Havok)
e1d6e1f377 Merge branch 'master' into ms-maxvollmer/importer_fixes 2021-04-26 14:53:32 +01:00