From 34fd8abf5ff3fc34a823bd7ef55f2f81894560a9 Mon Sep 17 00:00:00 2001 From: elsid Date: Sun, 24 Jul 2022 01:41:30 +0200 Subject: [PATCH] Move Animation::getPtr definitions to header --- apps/openmw/mwrender/animation.cpp | 10 ---------- apps/openmw/mwrender/animation.hpp | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index 0684550fb3..90417973e5 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -535,16 +535,6 @@ namespace MWRender mInsert->removeChild(mObjectRoot); } - MWWorld::ConstPtr Animation::getPtr() const - { - return mPtr; - } - - MWWorld::Ptr Animation::getPtr() - { - return mPtr; - } - void Animation::setActive(int active) { if (mSkeleton) diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp index ed1ddb78d2..c1d36b35c4 100644 --- a/apps/openmw/mwrender/animation.hpp +++ b/apps/openmw/mwrender/animation.hpp @@ -351,9 +351,9 @@ public: /// Must be thread safe virtual ~Animation(); - MWWorld::ConstPtr getPtr() const; + MWWorld::ConstPtr getPtr() const { return mPtr; } - MWWorld::Ptr getPtr(); + MWWorld::Ptr getPtr() { return mPtr; } /// Set active flag on the object skeleton, if one exists. /// @see SceneUtil::Skeleton::setActive