From f581c071e8aa40b0c6c995b58d5bba00064b8ec9 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 25 Aug 2022 19:02:26 -0400 Subject: [PATCH] fix merge --- include/common/settings.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/common/settings.hh b/include/common/settings.hh index 39deb7c9..0f20a1aa 100644 --- a/include/common/settings.hh +++ b/include/common/settings.hh @@ -642,7 +642,7 @@ public: using setting_vec3::setting_vec3; // allow mangle to only specify pitch, or pitch yaw - bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override + bool parse(const std::string &settingName, parser_base_t &parser, source source) override { qvec3d vec {}; @@ -660,7 +660,7 @@ public: parser.parse_token(); } - setValueFromParse(vec, locked); + setValue(vec, source); return true; }