From 7761b59dd9ab4611ff435ab40930d40c6474085d Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 26 Sep 2016 13:16:42 +0200 Subject: [PATCH] Utility/OBJLoader: Check OBJ files before processing them This removes a lot of errors from the logs in some cases Former-commit-id: b540b8b8f942c0e8805e3b3e76295669f5e6764a [formerly c71ce0c21549178438ebcc3c85ca9e9074966410] [formerly 454c698bfa5432f19f238890d303f3641dca7056 [formerly 6e501a315a69b38c11440988bdc5d5f2e7158852]] Former-commit-id: c5bfc674f09100d99a4c853a1dea96fd030fde49 [formerly 6f5190f8ed305b9726ef69d713a20e99d8c476a1] Former-commit-id: a72b009cc519caf76784336b2df8db9d5b2d8628 --- src/Nazara/Utility/Formats/OBJLoader.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Nazara/Utility/Formats/OBJLoader.cpp b/src/Nazara/Utility/Formats/OBJLoader.cpp index 11029bada..2a59ba703 100644 --- a/src/Nazara/Utility/Formats/OBJLoader.cpp +++ b/src/Nazara/Utility/Formats/OBJLoader.cpp @@ -37,6 +37,10 @@ namespace Nz if (parameters.custom.GetBooleanParameter("SkipNativeOBJLoader", &skip) && skip) return Ternary_False; + OBJParser parser; + if (!parser.Check(stream)) + return Ternary_False; + return Ternary_Unknown; }