348ae42212
Update Readme.md
2021-05-13 18:54:21 +02:00
8ab2e466f5
Update Readme.md
...
- Add folder AssetLib to readme in structure
2021-05-13 18:51:12 +02:00
eabae431f4
Merge pull request #3891 from JC3/jc3-dnase
...
[blender] Disable creation of "dna.txt"
2021-05-13 17:31:09 +02:00
22340469f4
Merge branch 'master' into jc3-dnase
2021-05-13 11:51:42 +02:00
0849f4e573
Merge pull request #3848 from contriteobserver/M3DasciiByDefault
...
build M3D ASCII support by default
2021-05-12 16:05:11 +02:00
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
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
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
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
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
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
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
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
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
7da9c42c81
[blender] Disable creation of "dna.txt"
...
Developers who want to enable it can either:
- *Temporarily* set ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 in BlenderDNA.h, or
- *Temporarily* define ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 on the build command line.
Addresses #3886 .
2021-05-05 19:30:29 -04:00
c08ad2e5c2
Merge branch 'master' into jc3-cctype-fixes
2021-05-05 19:04:47 -04:00
Kim Kulling
Jason C
Jason C