From 0f222d270ec5ed381c1203a31008cb63fef6b295 Mon Sep 17 00:00:00 2001 From: Alexei Dobrohotov Date: Thu, 23 Feb 2023 13:25:01 +0300 Subject: [PATCH] Prefer the earliest eponymous nodes in skeletons (bug #3842) --- CHANGELOG.md | 1 + components/sceneutil/skeleton.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b42b6471a6..c769b8a003 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ 0.49.0 ------ + Bug #3842: Body part skeletons override the main skeleton Bug #4127: Weapon animation looks choppy Bug #4204: Dead slaughterfish doesn't float to water surface after loading saved game Bug #4610: Casting a Bound Weapon spell cancels the casting animation by equipping the weapon prematurely diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp index f5221f028a..aa20ea7592 100644 --- a/components/sceneutil/skeleton.cpp +++ b/components/sceneutil/skeleton.cpp @@ -23,7 +23,7 @@ namespace SceneUtil void apply(osg::MatrixTransform& node) override { mPath.push_back(&node); - mCache[Misc::StringUtils::lowerCase(node.getName())] = mPath; + mCache.emplace(Misc::StringUtils::lowerCase(node.getName()), mPath); traverse(node); mPath.pop_back(); }