From ad473504995fd2c9134340318eaa6928db58cdd7 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: b843560802e9e94693e3009a2bb2fa5b999943b2 [formerly f8d90aced86d82320c6b204df6095d4e90d5d096] [formerly 71eae479386c14f1a849f5298a4273b777591668 [formerly 91000e7d5641e27fce88710737d0fd0852a467fa]] Former-commit-id: 45a6f0bf8ecf22fbbf9413f8d915ccd3010b4556 [formerly 1a1cc33d6ec5afef38988f9b12331ca52c24213b] Former-commit-id: 55c29ffe310d91590fb39c2894817dd8ff862cdb --- 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();