Commit Graph

10178 Commits

Author SHA1 Message Date
Carsten Rudolph
0905252833 Merge branch 'master' into master 2021-05-27 09:45:17 +02:00
Kim Kulling
ce0f696c71 Merge pull request #3896 from JC3/patch-1
[Logger] Log a notification instead of silently dropping long log messages.
2021-05-27 09:10:13 +02:00
Kim Kulling
aa8d746dc3 Merge branch 'master' into patch-1 2021-05-27 08:35:29 +02:00
Kim Kulling
29e5f5fed1 Merge branch 'master' into master 2021-05-26 13:18:04 +02:00
Kim Kulling
d4fb6847d8 Merge pull request #3878 from krishty/less-string-bloat
Less string bloat
2021-05-26 13:09:18 +02:00
Kim Kulling
b59db55b8c Merge branch 'master' into less-string-bloat 2021-05-26 12:14:08 +02:00
Kim Kulling
6f24e873b3 Merge pull request #3893 from thomasbiang/wangyi_basisu
Support basis universal to GLTF2 format
2021-05-25 17:28:19 +02:00
Kim Kulling
6b8a00dfa1 Merge branch 'master' into wangyi_basisu 2021-05-25 17:17:07 +02:00
Kim Kulling
743b87883e Merge pull request #3883 from ms-maxvollmer/importer_fixes_followup
Follow up to PR #3787
2021-05-25 16:27:32 +02:00
Kim Kulling
b5e54e4d3b Merge branch 'master' into wangyi_basisu 2021-05-25 16:17:29 +02:00
Kim Kulling
faeae27923 Merge branch 'master' into importer_fixes_followup 2021-05-25 16:15:09 +02:00
Kim Kulling
40f9d37a38 Merge pull request #3859 from spotaws/UVStreamNames
preserve UV Stream names in FBX files
2021-05-23 20:15:23 +02:00
Kim Kulling
aeaa22cbbd Merge branch 'master' into UVStreamNames 2021-05-23 14:37:28 +02:00
Kim Kulling
770b099540 Merge pull request #3858 from spotaws/PBRsupport
PBR material support
2021-05-23 14:35:24 +02:00
Kim Kulling
ac54fe41e2 Merge branch 'master' into PBRsupport 2021-05-23 13:23:06 +02:00
Kim Kulling
92b8c02982 Merge pull request #3847 from Garux/md3Tuning
Md3 tuning
2021-05-21 13:58:38 +02:00
Kim Kulling
ee85ebbd00 Merge branch 'master' into md3Tuning 2021-05-20 20:25:30 +02:00
Kim Kulling
53563a8624 Merge pull request #3856 from krishty/fix-sib-string-waste
fixed bloat in SIB importer
2021-05-20 20:24:49 +02:00
Kim Kulling
4f801a104e Merge branch 'master' into fix-sib-string-waste 2021-05-20 19:58:11 +02:00
Kim Kulling
79da512e99 Merge pull request #3908 from assimp/fix_nullptr_dereferences
Fix possible nullptr dereferences.
2021-05-20 14:12:15 +02:00
Kim Kulling
20ade095ea Return null-type in case of an empty document 2021-05-20 13:40:44 +02:00
Kim Kulling
dd0011b4a9 Merge branch 'master' into fix_nullptr_dereferences 2021-05-19 00:17:39 +02:00
Kim Kulling
88ccfedd10 Fix possible nullptr dereferences. 2021-05-19 00:16:15 +02:00
Kim Kulling
25d0cd39f6 Merge pull request #3907 from assimp/sml_doc
Xml doc
2021-05-18 21:38:12 +02:00
Kim Kulling
3726b2eef4 fix the build 2021-05-18 21:21:43 +02:00
Kim Kulling
3fa45e6a8c Merge branch 'master' into sml_doc 2021-05-18 21:18:02 +02:00
Kim Kulling
e01a6b4276 Add xml doc. 2021-05-18 21:15:48 +02:00
Kim Kulling
6cdfd3fcc1 Merge pull request #3905 from MalcolmTyrrell/MalcolmTyrrell/loggingImprovements
[Logger] Unify log formatting
2021-05-18 14:28:37 +02:00
Malcolm Tyrrell
54a27f4514 Merge branch 'master' into MalcolmTyrrell/loggingImprovements 2021-05-17 13:32:02 +01:00
Malcolm Tyrrell
3d3462a621 Simplify formatting templates. 2021-05-17 11:54:43 +01:00
Malcolm Tyrrell
084dc73b91 Fast path for unformatted calls. 2021-05-17 11:27:21 +01:00
Malcolm Tyrrell
fd5d1211f9 Recover comment which got dropped 2021-05-17 10:33:00 +01:00
Malcolm Tyrrell
6e4b9d267b Remove TODO. Typo fix. 2021-05-17 10:29:06 +01:00
Carsten Rudolph
43e1e4d3d3 Merge branch 'master' into master 2021-05-17 07:56:41 +02:00
Kim Kulling
0c9947f8b9 Merge pull request #3900 from Saalvage/decltype
Utilize decltype for slightly improved syntax
2021-05-16 21:16:22 +02:00
Kim Kulling
6dec8ad5f3 Merge branch 'master' into decltype 2021-05-16 19:21:49 +02:00
Kim Kulling
596f7db9f9 Merge pull request #3901 from impala454/master
Add support for arm 64 bit
2021-05-14 00:02:28 +02:00
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