c08ad2e5c2
Merge branch 'master' into jc3-cctype-fixes
2021-05-05 19:04:47 -04:00
1e89c06157
Merge pull request #3882 from assimp/optimize_3mf_strings
...
Optimize 3mf strings
2021-05-05 15:56:14 +02:00
5325b327c3
Merge branch 'master' into optimize_3mf_strings
2021-05-05 15:12:06 +02:00
3f5c3eb38c
Delete dna.txt
2021-05-05 15:11:36 +02:00
067993d607
Delete dae.dae
2021-05-05 15:11:20 +02:00
0aadd8a3f9
Delete spiderExport.stl
2021-05-05 15:10:59 +02:00
d1991ad949
Delete AssimpLog_Cpp.txt
2021-05-05 15:10:50 +02:00
e683c6eef9
Delete testExport.stl
2021-05-05 15:10:30 +02:00
9395322e56
Delete AssimpLog_C.txt
2021-05-05 15:10:22 +02:00
2a6b84c8ea
- closes https://github.com/assimp/assimp/issues/3830
...
- Fix rgba2hex
- Add tests
2021-05-05 14:43:51 +02:00
f15dcfa981
- Fix model parsing
2021-05-05 13:10:52 +02:00
cbce6d3dad
Merge branch 'optimize_3mf_strings' of https://github.com/assimp/assimp into optimize_3mf_strings
2021-05-05 10:46:54 +02:00
200086c4c5
[assimp_view] Make sure ctype calls use unsigned char.
...
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:46 -04:00
7dd7a053a9
[gtest] Fixed a rogue std::isalnum
...
Use IsAlNum instead (gtest-port.h), which deals with char signedness correctly. This was the only spot in gtest where a cctype function was called instead of its gtest-port.h equivalent.
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:46 -04:00
1ec8d4b6cf
[draco] Make sure ctype calls use unsigned char.
...
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:46 -04:00
2925592c64
[assimp] Make sure ctype calls use unsigned char.
...
Cast to unsigned char as required by C++ (see C++ **[cctype.cyn]** -> ISO C99 section 7.4, [see also](https://en.cppreference.com/w/cpp/string/byte/isspace )).
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:13 -04:00
38df0f4376
Merge pull request #3834 from JC3/patch-4
...
ASSIMP_ENABLE_DEV_IMPORTERS env var, applied to X3D importer
2021-05-04 22:33:48 +02:00
dc6fa58814
Merge branch 'master' into patch-4
2021-05-04 21:08:56 +02:00
be85eac703
Merge pull request #3877 from olsoneric/olsoneric-issue_2339_py_cant_load_obj
...
Use POINTER(char) for binary data. For pyassimp issue #2339 : Can't load OBJ
2021-05-04 21:08:35 +02:00
875acc5166
Merge branch 'master' into patch-4
2021-05-04 20:59:06 +02:00
f17d58cadd
Use POINTER(c_char) for binary data with pyassimp
...
"For a general character pointer that may also point to binary data,
POINTER(c_char) must be used." c_char_p is for a zero-terminated string.
Reference: https://docs.python.org/3/library/ctypes.html#ctypes.c_char_p
Applying this change to the 4.1.4 released python module fixes #2339 for
me in Ubuntu.
2021-05-04 13:38:38 -05:00
cd0fd30821
Merge pull request #3819 from vfxgordon/fbxBlendshapes
...
Fixed weighting issue with blendShapeChannels
2021-05-04 17:44:32 +02:00
e85a69a960
Update D3MFImporter.cpp
2021-05-04 15:31:07 +02:00
4231a86ad8
Merge branch 'master' into fbxBlendshapes
2021-05-04 06:22:22 -07:00
7690f92c81
Fix version of strnlen
2021-05-04 14:48:39 +02:00
47cacf8aa6
Merge branch 'master' into optimize_3mf_strings
2021-05-04 14:42:16 +02:00
ee5170c18a
- fix security issue
2021-05-04 14:40:25 +02:00
ff18354997
Merge pull request #3869 from assimp/optimize_3mf_strings
...
use const chars
2021-05-04 12:46:38 +02:00
0e17939e8d
Use const char* const
2021-05-04 12:09:38 +02:00
33a85e280f
Merge branch 'master' into optimize_3mf_strings
2021-05-04 11:47:11 +02:00
55fd820ed7
use const chars
2021-05-04 10:57:30 +02:00
70ba2e9e74
Merge pull request #3805 from krishty/fix-scale-msg
...
fixed malformatted message
2021-05-04 09:18:12 +02:00
39522178aa
Merge branch 'master' into fix-scale-msg
2021-05-04 08:13:12 +02:00
79802ad836
Merge pull request #3796 from krishty/fix-file-detection
...
small cleanup in file format detection
2021-05-04 07:54:09 +02:00
9ae3e88f6c
Merge branch 'master' into fbxBlendshapes
2021-05-03 07:40:25 -07:00
f29828f657
Merge branch 'master' into fix-file-detection
2021-05-02 19:41:33 +02:00
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
9e27afe353
Merge branch 'master' into 3ds-namespace
2021-05-02 17:38:29 +02:00
afdec791a6
Merge pull request #3795 from assimp/kimkulling-patch-3
...
Fix formatter.
2021-05-02 17:38:16 +02:00
e278673fe7
Merge branch 'master' into 3ds-namespace
2021-05-02 15:08:11 +02:00
e73a2ed5e0
style fix: namespace instead of class with public static members
2021-05-01 23:20:37 +02:00
6c429a9d82
Merge branch 'master' into kimkulling-patch-3
2021-05-01 19:29:37 +02:00
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
78132d666f
Merge branch 'master' into fix-3ds-matrix
2021-05-01 11:34:33 +02:00
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
7843b24e03
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-05-01 09:16:06 +02:00
d28e2e0a39
Merge pull request #3775 from diiigle/patch-1
...
Add PBRT to exportable file formats list
2021-05-01 09:15:34 +02:00
07257f4c66
Merge branch 'master' into patch-4
2021-04-30 22:23:23 -04:00
2d51efa002
Merge branch 'master' into patch-1
2021-04-30 21:14:26 +02:00
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
Jason C
Kim Kulling
kkulling
Jason C
Eric Olson
vfxgordon
kimkulling
Krishty