From 8e8900e4221d015aa10f69344584f139dc00a86f Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 20 Jan 2013 22:51:39 -0800 Subject: [PATCH] Use the first bone with text keys as the nonaccum root. --- components/nifogre/ogre_nif_loader.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp index 357866c7c2..890dcf7e98 100644 --- a/components/nifogre/ogre_nif_loader.cpp +++ b/components/nifogre/ogre_nif_loader.cpp @@ -320,8 +320,6 @@ void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, Ogre::Bone *&nonacc bone = skel->createBone(); if(parent) parent->addChild(bone); - if(!node->boneTrafo) - bone->setManuallyControlled(true); bone->setOrientation(node->trafo.rotation); bone->setPosition(node->trafo.pos); bone->setScale(Ogre::Vector3(node->trafo.scale)); @@ -338,7 +336,7 @@ void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, Ogre::Bone *&nonacc Nif::ExtraPtr e = node->extra; while(!e.empty()) { - if(e->recType == Nif::RC_NiTextKeyExtraData) + if(e->recType == Nif::RC_NiTextKeyExtraData && !nonaccum) { const Nif::NiTextKeyExtraData *tk = static_cast(e.getPtr()); textkeys = extractTextKeys(tk);