Merge branch 'master' into master

pull/4012/head
Spectrum76 2021-08-02 12:07:17 +05:30 committed by GitHub
commit bd2067fa8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -992,8 +992,8 @@ void ParseExtensions(aiMetadata *metadata, const CustomExtension &extension) {
metadata->Add(extension.name.c_str(), extension.mBoolValue.value); metadata->Add(extension.name.c_str(), extension.mBoolValue.value);
} else if (extension.mValues.isPresent) { } else if (extension.mValues.isPresent) {
aiMetadata val; aiMetadata val;
for (size_t i = 0; i < extension.mValues.value.size(); ++i) { for (auto const & subExtension : extension.mValues.value) {
ParseExtensions(&val, extension.mValues.value[i]); ParseExtensions(&val, subExtension);
} }
metadata->Add(extension.name.c_str(), val); metadata->Add(extension.name.c_str(), val);
} }
@ -1001,8 +1001,8 @@ void ParseExtensions(aiMetadata *metadata, const CustomExtension &extension) {
void ParseExtras(aiMetadata *metadata, const CustomExtension &extension) { void ParseExtras(aiMetadata *metadata, const CustomExtension &extension) {
if (extension.mValues.isPresent) { if (extension.mValues.isPresent) {
for (size_t i = 0; i < extension.mValues.value.size(); ++i) { for (auto const & subExtension : extension.mValues.value) {
ParseExtensions(metadata, extension.mValues.value[i]); ParseExtensions(metadata, subExtension);
} }
} }
} }