From 838d75a2e20261c92fc345b03c124fba7c0c4bff Mon Sep 17 00:00:00 2001 From: elsid Date: Sun, 7 Aug 2022 21:10:55 +0200 Subject: [PATCH] Avoid using owning raw pointer --- apps/openmw/mwrender/animation.cpp | 4 ++-- apps/openmw/mwrender/animation.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index 07562a7593..0882dce4ac 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -1734,7 +1734,7 @@ namespace MWRender mRootController = addRotateController("bip01"); } - RotateController* Animation::addRotateController(const std::string &bone) + osg::ref_ptr Animation::addRotateController(const std::string &bone) { auto iter = getNodeMap().find(bone); if (iter == getNodeMap().end()) @@ -1757,7 +1757,7 @@ namespace MWRender if (!foundKeyframeCtrl) return nullptr; - RotateController* controller = new RotateController(mObjectRoot.get()); + osg::ref_ptr controller(new RotateController(mObjectRoot.get())); node->addUpdateCallback(controller); mActiveControllers.emplace_back(node, controller); return controller; diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp index b3604dcaf1..1120813805 100644 --- a/apps/openmw/mwrender/animation.hpp +++ b/apps/openmw/mwrender/animation.hpp @@ -274,7 +274,7 @@ protected: float mLegsYawRadians; float mBodyPitchRadians; - RotateController* addRotateController(const std::string& bone); + osg::ref_ptr addRotateController(const std::string& bone); bool mHasMagicEffects;