Merge branch 'master' into remove-dead-code
commit
00a2cd20f9
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue