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

Merge pull request #3502 from MalcolmTyrrell/fbxTextureFix 

Prevent crash with malformed texture reference
pull/3501/head^2
Kim Kulling 2020-11-16 21:51:41 +01:00 committed by GitHub
parent 5e7d6a0e41 3221522f95
commit 25aaa333eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/AssetLib/FBX/FBXConverter.cpp
View File

@ -3481,10 +3481,11 @@ void FBXConverter::ConvertOrphanedEmbeddedTextures() {
const char *obtype = key.begin(); const char *obtype = key.begin();
const size_t length = static_cast<size_t>(key.end() - key.begin()); const size_t length = static_cast<size_t>(key.end() - key.begin());
if (strncmp(obtype, "Texture", length) == 0) { if (strncmp(obtype, "Texture", length) == 0) {
const Texture *texture = static_cast<const Texture *>(object->Get()); if (const Texture *texture = static_cast<const Texture *>(object->Get())) {
if (texture->Media() && texture->Media()->ContentLength() > 0) { if (texture->Media() && texture->Media()->ContentLength() > 0) {
realTexture = texture; realTexture = texture;
} }
}
} }
} catch (...) { } catch (...) {
// do nothing // do nothing