Kim Kulling
|
391d3195df
|
Merge branch 'master' into fbx-lights-export
|
2021-06-10 12:27:14 +02:00 |
|
Hill Ma
|
ef739c1703
|
glTF2: Make handling of embedded textures safer.
Previous code does not check whether the embedded texture exists.
|
2021-06-08 12:53:18 -07:00 |
|
Scott Baldric
|
ca1ab8b11b
|
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
|
2021-06-08 08:18:15 -05:00 |
|
Scott Baldric
|
8039351a67
|
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
|
2021-06-07 11:44:10 -05:00 |
|
Kim Kulling
|
a8ddc74426
|
Merge branch 'master' into fix-fbx-exporter2
|
2021-06-07 18:26:59 +02:00 |
|
Kim Kulling
|
d33cf1dc0c
|
Merge branch 'master' into x3d_pugi_migration
|
2021-06-06 16:06:08 +02:00 |
|
Scott Baldric
|
444fc9c373
|
Increasing length of mDataLength if rewriting the texture index increases magnitutde of index.
|
2021-06-04 16:32:46 -05:00 |
|
Kim Kulling
|
84db4d3a08
|
Update CMakeLists.txt
|
2021-06-03 23:56:52 +02:00 |
|
Kim Kulling
|
742250c5fb
|
Update CMakeLists.txt
|
2021-06-03 23:42:07 +02:00 |
|
Kim Kulling
|
a716f741d8
|
fix the include
|
2021-06-03 23:35:12 +02:00 |
|
Kim Kulling
|
e0d1a36523
|
Merge branch 'master' into stb-image-updated
|
2021-06-03 23:07:38 +02:00 |
|
Kim Kulling
|
d600b45cd2
|
Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration
|
2021-06-03 22:21:10 +02:00 |
|
Kim Kulling
|
3a32612b71
|
Add skipping of unused nodes.
|
2021-06-03 20:55:31 +02:00 |
|
Kim Kulling
|
c8510a1a82
|
Merge branch 'master' into fix-fbx-exporter2
|
2021-06-03 11:05:07 +02:00 |
|
Kim Kulling
|
77ce4080b6
|
fix viewer in case of unknown primitives.
|
2021-05-30 21:54:04 +02:00 |
|
Garux
|
3b565444c3
|
Merge branch 'Q1MDLgroup' of https://github.com/Garux/assimp into Q1MDLgroup
|
2021-05-30 11:55:45 +03:00 |
|
Garux
|
c776924adf
|
fix -Waddress-of-packed-member
|
2021-05-30 11:45:50 +03:00 |
|
Kim Kulling
|
09bb79c68a
|
Merge branch 'master' into issue_3711
|
2021-05-29 08:39:18 +02:00 |
|
Matthias Möller
|
7534b149cf
|
fix non skipped CR in header parsing
|
2021-05-28 15:28:35 +02:00 |
|
Kim Kulling
|
70cc1630fa
|
Merge branch 'master' into fix-gcc4.9-compilation
|
2021-05-27 15:25:01 +02:00 |
|
Carsten Rudolph
|
0905252833
|
Merge branch 'master' into master
|
2021-05-27 09:45:17 +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
|
b59db55b8c
|
Merge branch 'master' into less-string-bloat
|
2021-05-26 12:14:08 +02:00 |
|
Kim Kulling
|
6b8a00dfa1
|
Merge branch 'master' into wangyi_basisu
|
2021-05-25 17:17:07 +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 |
|
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 |
|
Jean-François Verdon
|
799384f2b8
|
Adding the required c flag to compile zip files using gcc 4.9
|
2021-05-22 17:36:39 +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
|
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 |
|
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 |
|