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

Merge branch 'master' into set_stl_mesh_names

pull/2472/head
Brian Naranjo 2019-05-20 08:52:20 -07:00 committed by GitHub
parent ff4ab7ff2e b4eb974d9e
commit 7ac831489c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/FBXMaterial.cpp
View File

@ -316,7 +316,7 @@ Video::Video(uint64_t id, const Element& element, const Document& doc, const std
relativeFileName = ParseTokenAsString(GetRequiredToken(*RelativeFilename,0)); relativeFileName = ParseTokenAsString(GetRequiredToken(*RelativeFilename,0));
} }
if(Content) { if(Content && !Content->Tokens().empty()) {
//this field is omitted when the embedded texture is already loaded, let's ignore if it's not found //this field is omitted when the embedded texture is already loaded, let's ignore if it's not found
try { try {
const Token& token = GetRequiredToken(*Content, 0); const Token& token = GetRequiredToken(*Content, 0);