From 7fe5710dd3315563d5a627f92b18975537f0425b Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 9 Aug 2016 00:08:31 +0200 Subject: [PATCH] Utility/OBJParser: Fix failure to load some OBJ because of their "high error rate" Former-commit-id: f9041ec52283dc0bdc83869c1d032303a1e200e8 [formerly be218c9edb44bf7e4bd075a60694febaff823c03] [formerly 7f7d145fd94379ba2ad3a853ccb2fe9f7d940397 [formerly 92ee9fda6879f5e85f6106bc30af475cebc3f78f]] Former-commit-id: 75d958c182fd859499881bde919f57e3baa1db0f [formerly a4d130067033e98e00904ebce6ba5ae372717bd3] Former-commit-id: a59ed77ae02e7d05de12c4d5d90755c8aef08af0 --- include/Nazara/Utility/Formats/OBJParser.inl | 2 +- src/Nazara/Utility/Formats/OBJParser.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Utility/Formats/OBJParser.inl b/include/Nazara/Utility/Formats/OBJParser.inl index 054d57754..b04506fdf 100644 --- a/include/Nazara/Utility/Formats/OBJParser.inl +++ b/include/Nazara/Utility/Formats/OBJParser.inl @@ -179,7 +179,7 @@ namespace Nz m_errorCount++; - if (m_lineCount > 20 && (m_errorCount * 100 / m_lineCount) > 50) + if (m_errorCount > 10 && (m_errorCount * 100 / m_lineCount) > 50) { NazaraError("Aborting parsing because of error percentage"); return false; //< Abort parsing if error percentage is too high diff --git a/src/Nazara/Utility/Formats/OBJParser.cpp b/src/Nazara/Utility/Formats/OBJParser.cpp index 7d3019c39..403950a97 100644 --- a/src/Nazara/Utility/Formats/OBJParser.cpp +++ b/src/Nazara/Utility/Formats/OBJParser.cpp @@ -31,6 +31,7 @@ namespace Nz String matName, meshName; matName = meshName = "default"; + m_errorCount = 0; m_keepLastLine = false; m_lineCount = 0; m_meshes.clear();