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

Merge pull request #3349 from rmstyrczula/fixFbxExportNullptr 

FBXExport: Fix crash if scene->mMetaData is null
pull/3350/head^2
Kim Kulling 2020-07-31 14:32:32 +02:00 committed by GitHub
parent 575ce6136d 3170c3d15c
commit ac8a8a5ad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/AssetLib/FBX/FBXExporter.cpp
View File

@ -405,7 +405,7 @@ void FBXExporter::WriteHeaderExtension ()
void WritePropInt(const aiScene* scene, FBX::Node& p, const std::string& key, int defaultValue) void WritePropInt(const aiScene* scene, FBX::Node& p, const std::string& key, int defaultValue)
{ {
int value; int value;
if (scene->mMetaData->Get(key, value)) { if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
p.AddP70int(key, value); p.AddP70int(key, value);
} else { } else {
p.AddP70int(key, defaultValue); p.AddP70int(key, defaultValue);
@ -415,12 +415,12 @@ void WritePropInt(const aiScene* scene, FBX::Node& p, const std::string& key, in
void WritePropDouble(const aiScene* scene, FBX::Node& p, const std::string& key, double defaultValue) void WritePropDouble(const aiScene* scene, FBX::Node& p, const std::string& key, double defaultValue)
{ {
double value; double value;
if (scene->mMetaData->Get(key, value)) { if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
p.AddP70double(key, value); p.AddP70double(key, value);
} else { } else {
// fallback lookup float instead // fallback lookup float instead
float floatValue; float floatValue;
if (scene->mMetaData->Get(key, floatValue)) { if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, floatValue)) {
p.AddP70double(key, (double)floatValue); p.AddP70double(key, (double)floatValue);
} else { } else {
p.AddP70double(key, defaultValue); p.AddP70double(key, defaultValue);
@ -431,7 +431,7 @@ void WritePropDouble(const aiScene* scene, FBX::Node& p, const std::string& key,
void WritePropEnum(const aiScene* scene, FBX::Node& p, const std::string& key, int defaultValue) void WritePropEnum(const aiScene* scene, FBX::Node& p, const std::string& key, int defaultValue)
{ {
int value; int value;
if (scene->mMetaData->Get(key, value)) { if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
p.AddP70enum(key, value); p.AddP70enum(key, value);
} else { } else {
p.AddP70enum(key, defaultValue); p.AddP70enum(key, defaultValue);
@ -441,7 +441,7 @@ void WritePropEnum(const aiScene* scene, FBX::Node& p, const std::string& key, i
void WritePropColor(const aiScene* scene, FBX::Node& p, const std::string& key, const aiVector3D& defaultValue) void WritePropColor(const aiScene* scene, FBX::Node& p, const std::string& key, const aiVector3D& defaultValue)
{ {
aiVector3D value; aiVector3D value;
if (scene->mMetaData->Get(key, value)) { if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
// ai_real can be float or double, cast to avoid warnings // ai_real can be float or double, cast to avoid warnings
p.AddP70color(key, (double)value.x, (double)value.y, (double)value.z); p.AddP70color(key, (double)value.x, (double)value.y, (double)value.z);
} else { } else {
@ -452,7 +452,7 @@ void WritePropColor(const aiScene* scene, FBX::Node& p, const std::string& key,
void WritePropString(const aiScene* scene, FBX::Node& p, const std::string& key, const std::string& defaultValue) void WritePropString(const aiScene* scene, FBX::Node& p, const std::string& key, const std::string& defaultValue)
{ {
aiString value; // MetaData doesn't hold std::string aiString value; // MetaData doesn't hold std::string
if (scene->mMetaData->Get(key, value)) { if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
p.AddP70string(key, value.C_Str()); p.AddP70string(key, value.C_Str());
} else { } else {
p.AddP70string(key, defaultValue); p.AddP70string(key, defaultValue);