From 9fa8e88366959c880eae78cc16d128fb3d9804f0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 12 Feb 2017 10:22:11 +0100
Subject: [PATCH] Revert "Don't create a CharacterController for objects with
no animations"
This reverts commit cce42b6e9d09331f9d52367b5324f32ebc18c2ff.
---
apps/openmw/mwmechanics/objects.cpp | 3 +--
apps/openmw/mwrender/animation.cpp | 5 -----
apps/openmw/mwrender/animation.hpp | 2 --
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index a15b4cba41..139825c215 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -29,8 +29,7 @@ void Objects::addObject(const MWWorld::Ptr& ptr)
removeObject(ptr);
MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);
- if (anim && anim->hasAnimSources())
- mObjects.insert(std::make_pair(ptr, new CharacterController(ptr, anim)));
+ if(anim) mObjects.insert(std::make_pair(ptr, new CharacterController(ptr, anim)));
}
void Objects::removeObject(const MWWorld::Ptr& ptr)
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 0865850e25..ec28d42958 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -565,11 +565,6 @@ namespace MWRender
}
}
- bool Animation::hasAnimSources() const
- {
- return !mAnimSources.empty();
- }
-
void Animation::clearAnimSources()
{
mStates.clear();
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 2ea369ea75..f765a7a409 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -341,8 +341,6 @@ public:
Animation(const MWWorld::Ptr &ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
virtual ~Animation();
- bool hasAnimSources() const;
-
MWWorld::ConstPtr getPtr() const;
/// Set active flag on the object skeleton, if one exists.