Kim Kulling
faeae27923
Merge branch 'master' into importer_fixes_followup
2021-05-25 16:15:09 +02:00
Jean-François Verdon
f13515a391
Adding basic support for lights in FBX exporter
2021-05-23 19:12:21 +02:00
Jean-François Verdon
6c104e096e
Merge branch 'master' into fix-gcc4.9-compilation
2021-05-23 19:06:28 +02:00
Kim Kulling
aeaa22cbbd
Merge branch 'master' into UVStreamNames
2021-05-23 14:37:28 +02:00
Kim Kulling
ac54fe41e2
Merge branch 'master' into PBRsupport
2021-05-23 13:23:06 +02:00
Jagoon
f96e3cde2d
Fix transform chain is applied twice
2021-05-23 00:06:05 +09:00
Jean-François Verdon
b7b3c6db7e
Fixing GCC 4.9 compilation issues
2021-05-22 16:57:07 +02:00
Jagoon
28e34878cb
Fix fbx exporter bug if root node contains meshes.
2021-05-22 23:20:34 +09:00
Kim Kulling
ee85ebbd00
Merge branch 'master' into md3Tuning
2021-05-20 20:25:30 +02:00
Kim Kulling
4f801a104e
Merge branch 'master' into fix-sib-string-waste
2021-05-20 19:58:11 +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
Malcolm Tyrrell
54a27f4514
Merge branch 'master' into MalcolmTyrrell/loggingImprovements
2021-05-17 13:32:02 +01:00
Malcolm Tyrrell
6e4b9d267b
Remove TODO. Typo fix.
2021-05-17 10:29:06 +01: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
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
78145f1425
log verboseDebug
2021-05-13 10:08:59 +01:00
Malcolm Tyrrell
89584c167a
Log debug
2021-05-13 09:56:42 +01:00
Kim Kulling
b70f195805
Merge branch 'master' into M3DasciiByDefault
2021-05-12 15:31:01 +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
f127144f71
Merge branch 'master' into c4d-cineware
2021-05-12 10:57:17 +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
Jason C
75af93aaa4
Merge branch 'master' into patch-2
2021-05-11 12:12:07 -04:00
Kim Kulling
4ee2f5f69d
Merge branch 'master' into aseHack
2021-05-11 11:40:24 +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#3890 , but was lost in a merge.
2021-05-10 19:06:39 -04:00
Kim Kulling
cb7d3ac598
Merge branch 'master' into jc3-spam-killa
2021-05-10 22:21:13 +02:00
Kim Kulling
e1a0e16a4e
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-10 22:07:25 +02:00
Kim Kulling
4807853f09
Merge branch 'master' into mdcOrient
2021-05-10 21:06:15 +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
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
Kim Kulling
319770db9d
Merge branch 'master' into jc3-cctype-fixes
2021-05-09 20:37:21 +02:00
ywang
a19b708144
support both ktx and ktx2
2021-05-07 16:27:23 -07:00
Jason C
9a2a0384f4
Merge branch 'master' into patch-3
2021-05-07 17:53:18 -04:00
Jason C
279e9a186f
Merge branch 'master' into jc3-dnase
2021-05-07 14:49:22 -04:00
Jason C
6eb15080ec
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-07 14:49:00 -04:00
Jason C
2fd6102573
Merge branch 'master' into jc3-spam-killa
2021-05-07 14:48:24 -04:00
Jason C
7b404788a6
Merge branch 'master' into jc3-cctype-fixes
2021-05-07 14:48:01 -04:00
Kim Kulling
25a0eb0d67
Merge branch 'master' into mdcOrient
2021-05-07 13:03:08 +02:00
Kim Kulling
8cae8c5461
Fix static code analysis findings
2021-05-07 11:52:16 +02:00
Kim Kulling
56bfa1ce5c
Make constructros with one arg explicit
2021-05-07 11:36:21 +02:00
ywang
2b9d88c943
support basis universal
2021-05-06 15:10:06 -07:00
