d5cde96fbd
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into new-file-detection
2021-05-05 13:14:35 +02:00
b546dfccc7
fix for 0f3e6e2941
...
Visual Studio’s Search All Files ignores ObjFileImporter.cpp and now I’m sure that’s a bug
2021-05-05 13:14:25 +02:00
6dcbd0d566
Merge branch 'master' into new-file-detection
2021-05-05 09:37:52 +02:00
deca47225f
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into new-file-detection
2021-05-05 00:59:20 +02:00
ae93f53b51
fixed signature-based detection on unknown extensions
2021-05-05 00:57:43 +02:00
b79b84d34e
Merge branch 'master' into new-file-detection
2021-05-05 00:09:42 +02:00
0f3e6e2941
replaced std::size() with AI_COUNT_OF for pre-C++20 compilers
2021-05-05 00:08:54 +02: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
4231a86ad8
Merge branch 'master' into fbxBlendshapes
2021-05-04 06:22:22 -07: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
88d64388f8
Update AMFImporter.cpp
2021-05-03 20:57:17 +02:00
b87f67db4c
Add missing include
2021-05-03 20:49:14 +02:00
60b99501a9
Merge branch 'master' into new-file-detection
2021-05-03 20:44:27 +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
2feda5b4b2
Merge branch 'master' into md2-mdc-const
2021-04-30 20:10:45 +02:00
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
60f030ccbc
Merge branch 'master' into empty-string-style
2021-04-30 19:50:38 +02:00
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
feeb89a1dd
closes https://github.com/assimp/assimp/issues/3831 : update zip
2021-04-30 16:49:15 +02:00
57091d761e
Merge branch 'master' into md2-mdc-const
2021-04-30 00:56:50 +02:00
0b92abe9b4
Merge branch 'master' into empty-string-style
2021-04-30 00:54:57 +02:00
5298ed8f9e
Merge branch 'master' into fbxBlendshapes
2021-04-29 15:21:16 -07:00
f523b1e0d7
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-04-29 08:52:51 -05:00
975de81ab6
Merge branch 'master' into patch-4
2021-04-28 22:23:17 -04:00
Krishty
Kim Kulling
Eric Olson
vfxgordon
kimkulling
kkulling
Jason C
Scott Baldric