Merge remote-tracking branch 'official/master' into contrib

This commit is contained in:
Léo Terziman
2014-03-24 10:44:57 +01:00
13 changed files with 380 additions and 187 deletions

View File

@@ -712,16 +712,12 @@ aiNode* ProcessSpatialStructure(aiNode* parent, const IfcProduct& el, Conversion
aiMetadata* data = new aiMetadata();
data->mNumProperties = properties.size();
data->mKeys = new aiString[data->mNumProperties]();
data->mValues = new aiString[data->mNumProperties]();
data->mValues = new aiMetadataEntry[data->mNumProperties]();
unsigned int index = 0;
BOOST_FOREACH(const Metadata::value_type& kv, properties)
data->Set(index++, kv.first, aiString(kv.second));
unsigned int i = 0;
BOOST_FOREACH(const Metadata::value_type& kv, properties) {
data->mKeys[i].Set(kv.first);
if (kv.second.length() > 0) {
data->mValues[i].Set(kv.second);
}
++i;
}
nd->mMetaData = data;
}
}