b70f195805
Merge branch 'master' into M3DasciiByDefault
2021-05-12 15:31:01 +02:00
a183ad17bb
Merge pull request #3843 from Garux/md2orient
...
fix md2 orientation
2021-05-12 15:28:11 +02:00
58bc4bcb63
log info
2021-05-12 12:55:21 +01:00
813d0aecdd
Adjust warn
2021-05-12 12:43:24 +01:00
7a3c8e5504
Merge branch 'master' into md2orient
2021-05-12 13:07:27 +02:00
8b13223314
Merge pull request #3851 from krishty/c4d-cineware
...
updated C4D importer to use the Cineware SDK
2021-05-12 12:27:25 +02:00
f127144f71
Merge branch 'master' into c4d-cineware
2021-05-12 10:57:17 +02:00
3768a2194e
Merge pull request #3842 from Garux/hl1mdlOrient
...
fix hl1 mdl orientation, tex coords, face windings order
2021-05-12 10:05:38 +02:00
8013c5011c
Merge branch 'master' into hl1mdlOrient
2021-05-12 08:21:40 +02:00
ad4ca71e4c
Merge branch 'master' into jc3-dnase
2021-05-12 00:56:46 +02:00
f197e93035
Merge pull request #3898 from JC3/patch-2
...
Reapply [amf] Fix crash when file could not be parsed.
2021-05-11 20:48:27 +02:00
8d20460ae4
Ditch decltype
2021-05-11 19:06:21 +02:00
75af93aaa4
Merge branch 'master' into patch-2
2021-05-11 12:12:07 -04:00
951c8a976c
Merge pull request #3844 from Garux/aseHack
...
support missing closing brace in material list after Ascii Scene Exporter v2.51
2021-05-11 16:20:31 +02:00
4ee2f5f69d
Merge branch 'master' into aseHack
2021-05-11 11:40:24 +02:00
a54cd432cd
Merge branch 'master' into master
2021-05-11 07:58:05 +02:00
632e4a20a9
Utilize decltype for slightly improved syntax
2021-05-11 05:29:51 +02:00
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#3890 , but was lost in a merge.
2021-05-10 19:06:39 -04:00
7ff6144c2c
Merge pull request #3881 from JC3/jc3-spam-killa
...
Misc. log output and message fixes
2021-05-11 00:09:16 +02:00
cb7d3ac598
Merge branch 'master' into jc3-spam-killa
2021-05-10 22:21:13 +02:00
cdc0bd00ce
Merge pull request #3890 from JC3/jc3-importer-open-error-handling
...
Fix importer ReadFile issues on file open error or when opening empty files
2021-05-10 22:19:52 +02:00
e1a0e16a4e
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-10 22:07:25 +02:00
76ccaeb42f
Merge pull request #3841 from Garux/mdcOrient
...
orient mdc correctly
2021-05-10 22:06:47 +02:00
4807853f09
Merge branch 'master' into mdcOrient
2021-05-10 21:06:15 +02:00
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
f87b180147
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 17:02:04 -04:00
b30cbcf117
Merge branch 'master' into jc3-spam-killa
2021-05-09 21:47:17 +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
0f85990fe3
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 14:42:17 -04:00
5cc05c26a7
Merge branch 'master' into jc3-spam-killa
2021-05-09 14:41:39 -04: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
859b32c045
[Logger] Log a notification instead of silently dropping long log messages.
...
Logs a notification instead of silently dropping long log messages, which can complicate debugging.
This way, if you don't see a message you expect to see, you'll immediately know why.
The *correct* approach would be to eliminate length filtering here entirely and use `snprintf` appropriately (also there's a tiny -- probably negligible -- performance hit here in calling `strlen` regardless of whether or not the verbosity level matches). Failing that, the second best option is to copy and truncate messages here. However, for now, this should be OK.
2021-05-07 22:32:32 -04:00
e37e00c51f
[assimp/fast_atof] Fixed garbage in exception messages.
...
Also reduced 100 byte context output to 30 (which is still probably excessive, but not *as* excessive).
2021-05-07 20:21:56 -04:00
a19b708144
support both ktx and ktx2
2021-05-07 16:27:23 -07:00
9a2a0384f4
Merge branch 'master' into patch-3
2021-05-07 17:53:18 -04:00
279e9a186f
Merge branch 'master' into jc3-dnase
2021-05-07 14:49:22 -04:00
6eb15080ec
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-07 14:49:00 -04:00
2fd6102573
Merge branch 'master' into jc3-spam-killa
2021-05-07 14:48:24 -04:00
7b404788a6
Merge branch 'master' into jc3-cctype-fixes
2021-05-07 14:48:01 -04:00
1b33dd1965
Document AI_CONFIG_EXPORT_BLOB_NAME.
2021-05-07 17:31:38 +02:00
8ff52c0f89
Pass base name from export properties to the IO system.
2021-05-07 17:31:30 +02:00
be85f238f4
Add optional blob base name to blob IO system.
2021-05-07 17:30:58 +02:00
964778cac1
Add AI_CONFIG_EXPORT_BLOB_NAME export property.
2021-05-07 17:30:26 +02:00
25a0eb0d67
Merge branch 'master' into mdcOrient
2021-05-07 13:03:08 +02: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
8cae8c5461
Fix static code analysis findings
2021-05-07 11:52:16 +02:00
56bfa1ce5c
Make constructros with one arg explicit
2021-05-07 11:36:21 +02:00
Kim Kulling
Malcolm Tyrrell
Salvage
Jason C
Carsten Rudolph
Krishty
Jason C
ywang