Malcolm Tyrrell
78145f1425
log verboseDebug
2021-05-13 10:08:59 +01:00
Malcolm Tyrrell
89584c167a
Log debug
2021-05-13 09:56:42 +01:00
Malcolm Tyrrell
58bc4bcb63
log info
2021-05-12 12:55:21 +01:00
Malcolm Tyrrell
813d0aecdd
Adjust warn
2021-05-12 12:43:24 +01:00
Kim Kulling
f127144f71
Merge branch 'master' into c4d-cineware
2021-05-12 10:57:17 +02:00
Kim Kulling
8013c5011c
Merge branch 'master' into hl1mdlOrient
2021-05-12 08:21:40 +02:00
Jason C
75af93aaa4
Merge branch 'master' into patch-2
2021-05-11 12:12:07 -04:00
Kim Kulling
4ee2f5f69d
Merge branch 'master' into aseHack
2021-05-11 11:40:24 +02:00
Jason C
00b625a2ae
[amf] Fix crash when file could not be parsed.
...
Fix double free of mXmlParser (deleted but not reset in ParseFile, then deleted again in ~AMFImporter).
Should probably use a smart pointer instead, though.
---
This change was previously made in 785cca1bb4
, as part of PR #3890 , but was lost in a merge.
2021-05-10 19:06:39 -04:00
Kim Kulling
cb7d3ac598
Merge branch 'master' into jc3-spam-killa
2021-05-10 22:21:13 +02:00
Kim Kulling
e1a0e16a4e
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-10 22:07:25 +02:00
Kim Kulling
4807853f09
Merge branch 'master' into mdcOrient
2021-05-10 21:06:15 +02:00
Jason C
f87b180147
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 17:02:04 -04:00
Kim Kulling
b30cbcf117
Merge branch 'master' into jc3-spam-killa
2021-05-09 21:47:17 +02:00
Jason C
0f85990fe3
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 14:42:17 -04:00
Jason C
5cc05c26a7
Merge branch 'master' into jc3-spam-killa
2021-05-09 14:41:39 -04:00
Kim Kulling
319770db9d
Merge branch 'master' into jc3-cctype-fixes
2021-05-09 20:37:21 +02:00
Jason C
9a2a0384f4
Merge branch 'master' into patch-3
2021-05-07 17:53:18 -04:00
Jason C
6eb15080ec
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-07 14:49:00 -04:00
Jason C
2fd6102573
Merge branch 'master' into jc3-spam-killa
2021-05-07 14:48:24 -04:00
Jason C
7b404788a6
Merge branch 'master' into jc3-cctype-fixes
2021-05-07 14:48:01 -04:00
Kim Kulling
25a0eb0d67
Merge branch 'master' into mdcOrient
2021-05-07 13:03:08 +02:00
Kim Kulling
bc7551b778
Merge branch 'master' into add-step-extension
2021-05-06 14:19:53 +02:00
Jason C
c08ad2e5c2
Merge branch 'master' into jc3-cctype-fixes
2021-05-05 19:04:47 -04:00
Jason C
de5c8ece6f
[xgl] Fail if file could not be parsed.
...
Fail instead of returning empty scene.
Partially addresses #3888 .
TODO: Propagate XML error detail through exception (depends on #3881 ).
2021-05-05 17:49:10 -04:00
Jason C
98f586c8d4
[irr] Fail if file could not be parsed.
...
Fail instead of returning empty scene.
Partially addresses #3888 .
TODO: Propagate XML error detail through exception (depends on #3881 ).
2021-05-05 17:48:44 -04:00
Jason C
470913bf27
[assbin] Fail if file could not be opened
...
Fail instead of returning empty scene.
Partially addresses #3888 .
2021-05-05 17:46:24 -04:00
Jason C
0d3e8b52be
[sib] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:32:10 -04:00
Jason C
a80b3b25eb
[quick3d] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:31:50 -04:00
Jason C
e52c297284
[nendo] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:31:24 -04:00
Jason C
1cd3752ec6
[ms3d] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:31:06 -04:00
Jason C
7f13387487
[cob] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:30:29 -04:00
Jason C
116ebf6e10
[3ds] Fix assertion failure when file could not be opened
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:30:05 -04:00
Jason C
785cca1bb4
[amf] Fix crash when file could not be parsed.
...
Fix double free of mXmlParser (deleted but not reset in ParseFile, then deleted again in ~AMFImporter).
Should probably use a smart pointer instead, though.
Partially addresses https://github.com/assimp/assimp/issues/3888 .
2021-05-05 17:13:10 -04:00
Jason C
f5a31b70f5
Merge branch 'master' into patch-3
2021-05-05 16:24:46 -04:00
Kim Kulling
992f10e7bf
Merge branch 'master' into remove-useless-scaling-prototype
2021-05-05 21:54:31 +02:00
Jason C
7ae8a52d9f
Merge branch 'master' into jc3-spam-killa
2021-05-05 10:33:29 -04:00
Kim Kulling
5325b327c3
Merge branch 'master' into optimize_3mf_strings
2021-05-05 15:12:06 +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
Jason C
ccd1a4455e
[ply] Fix minor typo in error message.
2021-05-04 21:57:00 -04:00
Jason C
a03dc4edaa
[amf] Fix minor typo in error message.
...
Added missing space to detail string on parse failure.
2021-05-04 21:56:49 -04:00
Jason C
f8609c2c2d
[opengex] Direct OpenDDLParser log messages to assimp logger
...
Also filter unprintable characters. Addresses second part of #3862 .
2021-05-04 21:54:14 -04:00
Jason C
9a04f5d4b0
Fix garbage messages in SIB, MD2, and MDC loaders.
2021-05-04 21:53:16 -04:00
Jason C
a9fb1e56ae
Add ai_str_toprintable; fixed garbage messages in HMP, MDL, Q3D loaders.
...
- ai_str_toprintable: See docs in StringUtils.h.
- HMP, MDL, Q3D: In particular, newlines in binary data were complicating logging.
2021-05-04 20:33:16 -04:00
Jason C
c8ad8c6017
[mmd] Remove stderr spam.
...
Removed stderr spam and cleaned up exception text.
Addresses #3865 .
2021-05-04 20:33:16 -04:00
Jason C
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
Kim Kulling
072aee7cbe
Merge branch 'master' into add-step-extension
2021-05-04 22:35:21 +02:00
Kim Kulling
e85a69a960
Update D3MFImporter.cpp
2021-05-04 15:31:07 +02:00
vfxgordon
4231a86ad8
Merge branch 'master' into fbxBlendshapes
2021-05-04 06:22:22 -07:00