Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fbx: add "strict" import mode (only accept 2012,2013 files).

Browse Source
This commit is contained in:
Alexander Gessler
2012-07-21 23:08:48 +02:00
parent b7456307dd
commit f617e766b1
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/FBXDocument.cpp
View File

@@ -494,9 +494,9 @@ const Object* LazyObject::Get(bool dieOnError)
flags &= ~BEING_CONSTRUCTED;
flags |= FAILED_TO_CONSTRUCT;
//if(dieOnError) {
if(dieOnError || doc.Settings().strictMode) {
throw;
//}
}
// note: the error message is already formatted, so raw logging is ok
if(!DefaultLogger::isNullLogger()) {
@@ -587,6 +587,13 @@ void Document::ReadHeader()
const Scope& shead = *ehead->Compound();
fbxVersion = ParseTokenAsInt(GetRequiredToken(GetRequiredElement(shead,"FBXVersion",ehead),0));
if(Settings().strictMode) {
if(fbxVersion < 7200 || fbxVersion > 7300) {
DOMError("unsupported format version, supported are only FBX 2012 and FBX 2013"\
" in ASCII format (turn off strict mode to try anyhow) ");
}
}
const Element* const ecreator = shead["Creator"];
if(ecreator) {
creator = ParseTokenAsString(GetRequiredToken(*ecreator,0));