Merge branch 'master' into issue_2043

This commit is contained in:
Matias Lavik
2019-04-04 16:36:44 +02:00
committed by GitHub
45 changed files with 6667 additions and 3899 deletions

View File

@@ -340,8 +340,11 @@ Video::Video(uint64_t id, const Element& element, const Document& doc, const std
content = new uint8_t[len];
::memcpy(content, data + 5, len);
}
} catch (runtime_error runtimeError) {
} catch (const runtime_error& runtimeError)
{
//we don't need the content data for contents that has already been loaded
ASSIMP_LOG_DEBUG_F("Caught exception in FBXMaterial (likely because content was already loaded): ",
runtimeError.what());
}
}