From 77e822b954ff0675b9b3d2a4bb97c5fdc4047ab2 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: 000e1e453f889ef686e2cc988e335c6e17d72224 [formerly d2e54a6c3a0ae7576b1ead3b9a5842d1cd75391e] [formerly c7e66ca673942b97a798fb60ddb900e74a2b5de1 [formerly 310b53ffe51db23112d2d1ed645515f48f51145f]] Former-commit-id: 1b33bf9ddaa0054a69b05fac297c0457b1125e53 [formerly c1928b6f285b4c255f8746671175733b954e99f9] Former-commit-id: 10c0e65d6e983909e70a66349bb6e688b2557512 --- 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();