v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FBX: fix handling of string metadata. Before, we would accidentially confuse aiString and std::string and trigger a debug assertion.

pull/287/head
Alexander Gessler 2014-05-22 16:22:38 +02:00
parent becd298e77
commit 1b6b238f09
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/FBXConverter.cpp
View File

@ -783,8 +783,8 @@ private:
data->Set(index++, prop.first, interpreted->Value()); data->Set(index++, prop.first, interpreted->Value());
else if (const TypedProperty<float>* interpreted = prop.second->As<TypedProperty<float> >()) else if (const TypedProperty<float>* interpreted = prop.second->As<TypedProperty<float> >())
data->Set(index++, prop.first, interpreted->Value()); data->Set(index++, prop.first, interpreted->Value());
else if (const TypedProperty<aiString>* interpreted = prop.second->As<TypedProperty<aiString> >()) else if (const TypedProperty<std::string>* interpreted = prop.second->As<TypedProperty<std::string> >())
data->Set(index++, prop.first, interpreted->Value()); data->Set(index++, prop.first, aiString(interpreted->Value()));
else if (const TypedProperty<aiVector3D>* interpreted = prop.second->As<TypedProperty<aiVector3D> >()) else if (const TypedProperty<aiVector3D>* interpreted = prop.second->As<TypedProperty<aiVector3D> >())
data->Set(index++, prop.first, interpreted->Value()); data->Set(index++, prop.first, interpreted->Value());
else else