From 45c57721ffb993a19294326a36c25b64c2a985ff Mon Sep 17 00:00:00 2001
From: Jason Hooks <jhooks1@mix.wvu.edu>
Date: Wed, 4 Jan 2012 20:30:06 -0500
Subject: [PATCH] Turning off hardware skinning2

---
 apps/openmw/mwrender/animation.cpp     | 4 ++--
 apps/openmw/mwrender/npcanimation.cpp  | 2 +-
 components/nifogre/ogre_nif_loader.cpp | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index b272980c78..e83cd44fdb 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -412,8 +412,8 @@ namespace MWRender{
             bone->setOrientation(r);
 
         if(iter == transformations->begin()){
-            trans = bone->_getDerivedPosition();
-            rotate = bone->_getDerivedOrientation();
+            trans = bone->getPosition();
+            rotate = bone->getOrientation();
         }
         skel->getManualBonesDirty();
         skel->_updateTransforms();
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 4630f0d3bc..442ee4c815 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -266,7 +266,7 @@ void NpcAnimation::runAnimation(float timepassed){
             Ogre::Quaternion boneQuat = rotate;
             Ogre::Vector3 boneTrans = trans;
             mEnvironment.mWorld->setObjectPhysicsPosition(insert->getName(), boneTrans + insert->getPosition());
-            mEnvironment.mWorld->setObjectPhysicsRotation(insert->getName(), boneQuat * insert->getOrientation());
+            //mEnvironment.mWorld->setObjectPhysicsRotation(insert->getName(), boneQuat * insert->getOrientation());
             
         }*/
        // handleAnimationTransforms(base);
diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp
index 4cfbc3e7f3..f6c0288548 100644
--- a/components/nifogre/ogre_nif_loader.cpp
+++ b/components/nifogre/ogre_nif_loader.cpp
@@ -217,6 +217,7 @@ void NIFLoader::createMaterial(const String &name,
     // will automatically be loaded when needed. If not (such as for
     // internal NIF textures that we might support later), we should
     // already have inserted a manual loader for the texture.
+    /*
     if(!mSkel.isNull()){
     material->removeAllTechniques();
   
@@ -224,7 +225,7 @@ void NIFLoader::createMaterial(const String &name,
         //tech->setSchemeName("blahblah");
         Pass* pass = tech->createPass();
         pass->setVertexProgram("Ogre/HardwareSkinningFourWeights");
-    }
+    }*/
     if (!texName.empty())
     {
         Pass *pass = material->getTechnique(0)->getPass(0);