From 847e2bbeaf0e8e3a1ecb7c2a10f97784ef4bba09 Mon Sep 17 00:00:00 2001 From: psi29a Date: Fri, 16 Sep 2022 11:45:03 +0000 Subject: [PATCH] Merge branch 'fix_reserved_nodes' into 'master' Add missing non-prefixed reserved nodes See merge request OpenMW/openmw!2414 (cherry picked from commit cd8b20439ec707574826679a8f851546c78e294e) ac01fd5e Add missing non-prefixed reserved nodes --- components/resource/scenemanager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp index 0a39ae7f6a..738505b2d6 100644 --- a/components/resource/scenemanager.cpp +++ b/components/resource/scenemanager.cpp @@ -665,10 +665,11 @@ namespace Resource }; std::vector result; - result.reserve(std::size(names)); + result.reserve(2 * std::size(names)); for (std::string_view name : names) { + result.emplace_back(name); std::string prefixedName("Tri "); prefixedName += name; result.push_back(std::move(prefixedName));