James Franco
|
1543738b1f
|
Merge branch 'master' into cached_output_directory_vars
|
2021-05-18 16:24:32 -04: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 |
|
ogjamesfranco
|
27135bd3e7
|
changed the assimp output directory vars to cached vars
|
2021-05-15 15:27:24 -04: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 |
|
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 |