ab43f3fefd
Merge branch 'stb-image-updated' of https://github.com/krishty/assimp into stb-image-updated
2021-05-10 20:44:55 +02:00
d75f8bd5b0
silence warnings in stb_image.h
...
Re-applies 09c5564d5b
2021-05-10 20:44:43 +02:00
433620350e
Merge branch 'master' into stb-image-updated
2021-05-10 11:30:45 +02:00
38dc92c5c9
Merge pull request #3880 from JC3/jc3-cctype-fixes
...
Make sure ctype calls use unsigned chars.
2021-05-09 21:46:35 +02:00
319770db9d
Merge branch 'master' into jc3-cctype-fixes
2021-05-09 20:37:21 +02:00
226b34bb35
Merge pull request #3850 from JC3/patch-3
...
Fix crash in CanRead when file can not be opened.
2021-05-09 20:25:58 +02:00
9a2a0384f4
Merge branch 'master' into patch-3
2021-05-07 17:53:18 -04:00
7b404788a6
Merge branch 'master' into jc3-cctype-fixes
2021-05-07 14:48:01 -04:00
d7c65d363c
Merge pull request #3839 from Garux/mRootNode_mTransformation
...
consider pScene->mRootNode->mTransformation set by some importers while using AI_CONFIG_PP_PTV_ROOT_TRANSFORMATION
2021-05-07 11:52:44 +02:00
25cf5dd487
Merge branch 'master' into mRootNode_mTransformation
2021-05-06 21:40:03 +02:00
b1b937ea79
Merge pull request #3838 from Garux/fixGenNormals
...
consider aiProcess_FlipWindingOrder in aiProcess_GenNormals & aiProcess_GenSmoothNormals
2021-05-06 20:40:17 +02:00
e120544978
Merge branch 'master' into fixGenNormals
2021-05-06 17:28:37 +02:00
1c90d28f9b
Merge pull request #3837 from krishty/add-step-extension
...
added .step extension to IFC loader
2021-05-06 17:25:22 +02:00
bc7551b778
Merge branch 'master' into add-step-extension
2021-05-06 14:19:53 +02:00
253fdbdeda
Merge pull request #3808 from ericwa/SimpleTexturedDirectx11Fixes
...
SimpleTexturedDirectx11 sample: support embedded uncompressed textures
2021-05-06 14:19:15 +02:00
f53ae076a7
Merge branch 'master' into SimpleTexturedDirectx11Fixes
2021-05-06 14:07:08 +02:00
90d3ff27f8
Merge pull request #3806 from krishty/remove-useless-scaling-prototype
...
removed dead code from 0d29203e24
2021-05-06 14:04:35 +02:00
55056d11fd
Add missing include
2021-05-06 11:50:08 +02:00
c08ad2e5c2
Merge branch 'master' into jc3-cctype-fixes
2021-05-05 19:04:47 -04:00
6c7ee61f14
Merge branch 'stb-image-updated' of https://github.com/krishty/assimp into stb-image-updated
2021-05-05 23:15:59 +02:00
816da9b677
merge and update all copies of stb_image.h
2021-05-05 23:15:41 +02:00
24df52647f
merge and update all copies of stb_image.h
2021-05-05 23:05:44 +02:00
f5a31b70f5
Merge branch 'master' into patch-3
2021-05-05 16:24:46 -04:00
992f10e7bf
Merge branch 'master' into remove-useless-scaling-prototype
2021-05-05 21:54:31 +02: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
072aee7cbe
Merge branch 'master' into add-step-extension
2021-05-04 22:35:21 +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
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
Krishty
Kim Kulling
Jason C
kkulling
Jason C
Eric Olson
vfxgordon
kimkulling