48e99d2e0a
Merge branch 'master' into master
2021-05-27 10:45:36 +02:00
64d5f21627
Merge pull request #3912 from dlyr/fix-fov-doc
...
Fix camera fov comment since full fov is stored
2021-05-27 10:41:01 +02:00
7258441153
Merge branch 'master' into fix-fov-doc
2021-05-27 10:26:20 +02:00
c33a4b2634
Fixed base name check.
2021-05-27 10:10:55 +02:00
0905252833
Merge branch 'master' into master
2021-05-27 09:45:17 +02:00
c557cf970a
Merge branch 'master' into master
2021-05-27 17:37:06 +10:00
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
aa8d746dc3
Merge branch 'master' into patch-1
2021-05-27 08:35:29 +02:00
f6b9e93e24
Merge branch 'master' into master
2021-05-27 12:42:46 +10:00
29e5f5fed1
Merge branch 'master' into master
2021-05-26 13:18:04 +02:00
d4fb6847d8
Merge pull request #3878 from krishty/less-string-bloat
...
Less string bloat
2021-05-26 13:09:18 +02:00
b59db55b8c
Merge branch 'master' into less-string-bloat
2021-05-26 12:14:08 +02:00
2f4fba0703
Static cast i back to unsigned int because MSVC complains otherwise.
...
i will never be bigger than an unsigned int since that's what mNumProperties is to begin with.
2021-05-26 19:11:19 +10:00
5468dd667e
Fix bug in aiMetadata constructor that overwrites an array of one of aiString, aiVector3D, or aiMetadata with the first entry
...
aiMetadata copy constructor calls aiMetadata::Get on the copied from aiMetadata using the const aiString &key version. When
this is called on the metadata of an array type, this overwrites all entries with the first entry. This is due to the key
of all entries in an array being the name of the array. ie, in a glTF2 file with an extension:
"Extension" : [
"Value1",
"Value2",
"Value3"
]
the aiMetadata struct for the "Extension" entry will have 3 entries with key/value pairs as:
"Extension"/"Value1"
"Extension"/"Value2"
"Extension"/"Value3"
So when the copy constructor calls the key based aiMetadata::Get, it will find "Value1" for all three entries.
This change simply replaces the key based aiMetadata::Get with the index based aiMetadata::Get
2021-05-26 18:36:56 +10:00
6f24e873b3
Merge pull request #3893 from thomasbiang/wangyi_basisu
...
Support basis universal to GLTF2 format
2021-05-25 17:28:19 +02:00
6b8a00dfa1
Merge branch 'master' into wangyi_basisu
2021-05-25 17:17:07 +02:00
743b87883e
Merge pull request #3883 from ms-maxvollmer/importer_fixes_followup
...
Follow up to PR #3787
2021-05-25 16:27:32 +02:00
b5e54e4d3b
Merge branch 'master' into wangyi_basisu
2021-05-25 16:17:29 +02:00
faeae27923
Merge branch 'master' into importer_fixes_followup
2021-05-25 16:15:09 +02:00
40f9d37a38
Merge pull request #3859 from spotaws/UVStreamNames
...
preserve UV Stream names in FBX files
2021-05-23 20:15:23 +02:00
f13515a391
Adding basic support for lights in FBX exporter
2021-05-23 19:12:21 +02:00
6c104e096e
Merge branch 'master' into fix-gcc4.9-compilation
2021-05-23 19:06:28 +02:00
aeaa22cbbd
Merge branch 'master' into UVStreamNames
2021-05-23 14:37:28 +02:00
770b099540
Merge pull request #3858 from spotaws/PBRsupport
...
PBR material support
2021-05-23 14:35:24 +02:00
ac54fe41e2
Merge branch 'master' into PBRsupport
2021-05-23 13:23:06 +02:00
799384f2b8
Adding the required c flag to compile zip files using gcc 4.9
2021-05-22 17:36:39 +02:00
f96e3cde2d
Fix transform chain is applied twice
2021-05-23 00:06:05 +09:00
b7b3c6db7e
Fixing GCC 4.9 compilation issues
2021-05-22 16:57:07 +02:00
28e34878cb
Fix fbx exporter bug if root node contains meshes.
2021-05-22 23:20:34 +09:00
7686393fe3
Merge branch 'master' into update_draco
2021-05-22 13:14:05 +02:00
1f32743f8b
Fix camera fov comment since full fov is stored
2021-05-22 00:56:01 +02:00
f675aaa871
Merge branch 'master' into cached_output_directory_vars
2021-05-21 14:51:34 +02:00
92b8c02982
Merge pull request #3847 from Garux/md3Tuning
...
Md3 tuning
2021-05-21 13:58:38 +02:00
53790e8273
Update Draco to upstream e4103dc
...
Fixes some MSVC and mingw compiler issues
Sets VERSION and SO_VERSION
e4103dc39f
2021-05-21 12:25:36 +01:00
ee85ebbd00
Merge branch 'master' into md3Tuning
2021-05-20 20:25:30 +02:00
53563a8624
Merge pull request #3856 from krishty/fix-sib-string-waste
...
fixed bloat in SIB importer
2021-05-20 20:24:49 +02:00
4f801a104e
Merge branch 'master' into fix-sib-string-waste
2021-05-20 19:58:11 +02:00
b622eb5689
Merge branch 'master' into cached_output_directory_vars
2021-05-20 14:12:29 +02:00
79da512e99
Merge pull request #3908 from assimp/fix_nullptr_dereferences
...
Fix possible nullptr dereferences.
2021-05-20 14:12:15 +02:00
20ade095ea
Return null-type in case of an empty document
2021-05-20 13:40:44 +02:00
dd0011b4a9
Merge branch 'master' into fix_nullptr_dereferences
2021-05-19 00:17:39 +02:00
88ccfedd10
Fix possible nullptr dereferences.
2021-05-19 00:16:15 +02:00
1543738b1f
Merge branch 'master' into cached_output_directory_vars
2021-05-18 16:24:32 -04:00
25d0cd39f6
Merge pull request #3907 from assimp/sml_doc
...
Xml doc
2021-05-18 21:38:12 +02:00
3726b2eef4
fix the build
2021-05-18 21:21:43 +02:00
3fa45e6a8c
Merge branch 'master' into sml_doc
2021-05-18 21:18:02 +02:00
e01a6b4276
Add xml doc.
2021-05-18 21:15:48 +02:00
6cdfd3fcc1
Merge pull request #3905 from MalcolmTyrrell/MalcolmTyrrell/loggingImprovements
...
[Logger] Unify log formatting
2021-05-18 14:28:37 +02:00
54a27f4514
Merge branch 'master' into MalcolmTyrrell/loggingImprovements
2021-05-17 13:32:02 +01:00
3d3462a621
Simplify formatting templates.
2021-05-17 11:54:43 +01:00
Kim Kulling
Carsten Rudolph
Evangel63
Jean-François Verdon
Jean-François Verdon
Jagoon
dlyr
RichardTea
Kim Kulling
James Franco
Malcolm Tyrrell
Malcolm Tyrrell