From 408c9739c8c9098f6ea65450999767d9978e276d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 13 Aug 2022 15:31:28 +0200
Subject: [PATCH] MeshOptimizerSceneConverter: update notes for recently
 released 0.18.

---
 .../MeshOptimizerSceneConverter.conf            |  4 +---
 .../MeshOptimizerSceneConverter.cpp             | 17 +++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/MagnumPlugins/MeshOptimizerSceneConverter/MeshOptimizerSceneConverter.conf b/src/MagnumPlugins/MeshOptimizerSceneConverter/MeshOptimizerSceneConverter.conf
index 95dbac27e..dc7bf02c1 100644
--- a/src/MagnumPlugins/MeshOptimizerSceneConverter/MeshOptimizerSceneConverter.conf
+++ b/src/MagnumPlugins/MeshOptimizerSceneConverter/MeshOptimizerSceneConverter.conf
@@ -20,9 +20,7 @@ simplifyTargetIndexCountThreshold=1.0
 simplifyTargetError=1.0e-2
 # Do not move vertices that are located on the topological border (vertices on
 # triangle edges that don't have a paired triangle). Useful for simplifying
-# portions of the larger mesh. Available since
-# https://github.com/zeux/meshoptimizer/pull/432 (to be released as 0.18),
-# ignored on older versions.
+# portions of the larger mesh. Available since 0.18, ignored on older versions.
 simplifyLockBorder=false
 
 # Used by mesh efficiency analyzers when verbose output is enabled. Defaults
diff --git a/src/MagnumPlugins/MeshOptimizerSceneConverter/MeshOptimizerSceneConverter.cpp b/src/MagnumPlugins/MeshOptimizerSceneConverter/MeshOptimizerSceneConverter.cpp
index 1c963991a..7549631f2 100644
--- a/src/MagnumPlugins/MeshOptimizerSceneConverter/MeshOptimizerSceneConverter.cpp
+++ b/src/MagnumPlugins/MeshOptimizerSceneConverter/MeshOptimizerSceneConverter.cpp
@@ -288,12 +288,13 @@ bool MeshOptimizerSceneConverter::doConvertInPlace(MeshData& mesh) {
 
 namespace {
 
-/* As of https://github.com/zeux/meshoptimizer/pull/432 (to be released as
-   0.18), the meshopt_simplify() has a new second-to-last options argument,
-   this pair of templates adapts to that -- by either passing the function
-   pointer through unchanged or by wrapping it in a lambda that ignores the
-   options argument (and the result_error on versions before 0.16) */
-/** @todo use an ifdef instead once we can rely on MESHOPTIMIZER_VERSION */
+/* As of version 0.18 (https://github.com/zeux/meshoptimizer/pull/432), the
+   meshopt_simplify() has a new second-to-last options argument, this pair of
+   templates adapts to that -- by either passing the function pointer through
+   unchanged or by wrapping it in a lambda that ignores the options argument
+   (and the result_error on versions before 0.16) */
+/** @todo switch to #if MESHOPTIMIZER_VERSION >= 180 once enough time passes
+    (released on 2022-08-01) */
 template<std::size_t(*F)(UnsignedInt*, const UnsignedInt*, std::size_t, const Float*, std::size_t, std::size_t, std::size_t, Float
     #if MESHOPTIMIZER_VERSION >= 160
     , Float*
@@ -394,8 +395,8 @@ Containers::Optional<MeshData> MeshOptimizerSceneConverter::doConvert(const Mesh
                 targetIndexCount,
                 targetError,
                 configuration().value<bool>("simplifyLockBorder") ?
-                    /** @todo use a real value once we can rely on
-                        MESHOPTIMIZER_VERSION */
+                    /** @todo switch to #if MESHOPTIMIZER_VERSION >= 180 once
+                        enough time passes (released on 2022-08-01) */
                     1 /*meshopt_SimplifyLockBorder*/ : 0,
                 nullptr);
         }