Commit Graph

10348 Commits (aa883eda195fd144a27789f69059a8742ad93103)

Author SHA1 Message Date
Kim Kulling dba4e21f7c
Merge branch 'master' into master 2021-05-13 23:51:35 +02:00
Kim Kulling 403aef8cea
Merge pull request #3902 from assimp/kimkulling-readme-fix
Update Readme.md
2021-05-13 19:17:49 +02:00
Kim Kulling 348ae42212
Update Readme.md 2021-05-13 18:54:21 +02:00
Kim Kulling 8ab2e466f5
Update Readme.md
- Add folder AssetLib to readme in structure
2021-05-13 18:51:12 +02:00
Kim Kulling eabae431f4
Merge pull request #3891 from JC3/jc3-dnase
[blender] Disable creation of "dna.txt"
2021-05-13 17:31:09 +02:00
Malcolm Tyrrell 4ec01cfdcd Improve use of logging 2021-05-13 12:05:31 +01:00
Kim Kulling 22340469f4
Merge branch 'master' into jc3-dnase 2021-05-13 11:51:42 +02:00
Malcolm Tyrrell ad6f300b1d Other LogAux functions 2021-05-13 10:43:28 +01:00
Malcolm Tyrrell c5f22269a8 LogAux 2021-05-13 10:33:25 +01:00
Malcolm Tyrrell 7abfd134b6 LogAux warn 2021-05-13 10:33:16 +01:00
Malcolm Tyrrell 5cd3bdd5c2 No need to distinguish formatting log functions. 2021-05-13 10:25:27 +01:00
Malcolm Tyrrell 6957d34733 Simplify the macros. 2021-05-13 10:14:24 +01:00
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 ca698c3e49 Log error 2021-05-13 09:36:42 +01:00
Carsten Rudolph a700285c64
Merge branch 'master' into master 2021-05-13 08:37:59 +02:00
Chuck Claunch 18beae988c Add support for arm 64 bit 2021-05-12 21:57:24 +00:00
Kim Kulling 0849f4e573
Merge pull request #3848 from contriteobserver/M3DasciiByDefault
build M3D ASCII support by default
2021-05-12 16:05:11 +02:00
Kim Kulling b70f195805
Merge branch 'master' into M3DasciiByDefault 2021-05-12 15:31:01 +02:00
Kim Kulling a183ad17bb
Merge pull request #3843 from Garux/md2orient
fix md2 orientation
2021-05-12 15:28:11 +02: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 7a3c8e5504
Merge branch 'master' into md2orient 2021-05-12 13:07:27 +02:00
Kim Kulling 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
Kim Kulling f127144f71
Merge branch 'master' into c4d-cineware 2021-05-12 10:57:17 +02:00
Kim Kulling 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
Kim Kulling 8013c5011c
Merge branch 'master' into hl1mdlOrient 2021-05-12 08:21:40 +02:00
Kim Kulling ad4ca71e4c
Merge branch 'master' into jc3-dnase 2021-05-12 00:56:46 +02:00
Kim Kulling 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
Salvage 8d20460ae4
Ditch decltype 2021-05-11 19:06:21 +02:00
Jason C 75af93aaa4
Merge branch 'master' into patch-2 2021-05-11 12:12:07 -04:00
Kim Kulling 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
Kim Kulling 4ee2f5f69d
Merge branch 'master' into aseHack 2021-05-11 11:40:24 +02:00
Carsten Rudolph a54cd432cd
Merge branch 'master' into master 2021-05-11 07:58:05 +02:00
Salvage 632e4a20a9
Utilize decltype for slightly improved syntax 2021-05-11 05:29:51 +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 7ff6144c2c
Merge pull request #3881 from JC3/jc3-spam-killa
Misc. log output and message fixes
2021-05-11 00:09:16 +02:00
Kim Kulling cb7d3ac598
Merge branch 'master' into jc3-spam-killa 2021-05-10 22:21:13 +02:00
Kim Kulling 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
Kim Kulling e1a0e16a4e
Merge branch 'master' into jc3-importer-open-error-handling 2021-05-10 22:07:25 +02:00
Kim Kulling 76ccaeb42f
Merge pull request #3841 from Garux/mdcOrient
orient mdc correctly
2021-05-10 22:06:47 +02:00
Kim Kulling 4807853f09
Merge branch 'master' into mdcOrient 2021-05-10 21:06:15 +02:00
Krishty ab43f3fefd Merge branch 'stb-image-updated' of https://github.com/krishty/assimp into stb-image-updated 2021-05-10 20:44:55 +02:00
Krishty d75f8bd5b0 silence warnings in stb_image.h
Re-applies 09c5564d5b to stb_image.h’s new path.
2021-05-10 20:44:43 +02:00
Kim Kulling 433620350e
Merge branch 'master' into stb-image-updated 2021-05-10 11:30:45 +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
Kim Kulling 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
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