From 6a3ba411702625fb295c801337cbae5e4dd3ba4e Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 6 May 2013 21:46:11 -0700
Subject: [PATCH] Don't store camera nodes, we don't need them.

---
 apps/openmw/mwrender/animation.cpp   | 1 -
 components/nifogre/ogrenifloader.cpp | 4 +---
 components/nifogre/ogrenifloader.hpp | 6 ------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index e85312559f..bfffbefdcf 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -51,7 +51,6 @@ void Animation::destroyObjectList(Ogre::SceneManager *sceneMgr, NifOgre::ObjectL
     for(size_t i = 0;i < objects.mEntities.size();i++)
         sceneMgr->destroyEntity(objects.mEntities[i]);
     objects.mControllers.clear();
-    objects.mCameras.clear();
     objects.mParticles.clear();
     objects.mEntities.clear();
     objects.mSkelBase = NULL;
diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp
index d36199f867..acd99c26b4 100644
--- a/components/nifogre/ogrenifloader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -748,9 +748,7 @@ class NIFObjectLoader
 
         if(node->recType == Nif::RC_NiCamera)
         {
-            int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, node->recIndex);
-            Ogre::Bone *trgtbone = objectlist.mSkelBase->getSkeleton()->getBone(trgtid);
-            objectlist.mCameras.push_back(trgtbone);
+            /* Ignored */
         }
 
         if(node->recType == Nif::RC_NiTriShape && !(flags&0x80000000))
diff --git a/components/nifogre/ogrenifloader.hpp b/components/nifogre/ogrenifloader.hpp
index 40577e4515..7db12281eb 100644
--- a/components/nifogre/ogrenifloader.hpp
+++ b/components/nifogre/ogrenifloader.hpp
@@ -44,12 +44,6 @@ struct ObjectList {
     std::vector<Ogre::Entity*> mEntities;
     std::vector<Ogre::ParticleSystem*> mParticles;
 
-    // We could actually have Ogre::Camera objects, but that means more
-    // maintenance when switching cameras. The information in the NiCamera node
-    // is pretty much useless too anyway. So instead, this is just a list of
-    // bones in the mSkelBase which are NiCamera nodes.
-    std::vector<Ogre::Bone*> mCameras;
-
     std::map<int,TextKeyMap> mTextKeys;
 
     std::vector<Ogre::Controller<Ogre::Real> > mControllers;