Merge remote-tracking branch 'scrawl/light'

This commit is contained in:
Marc Zinnschlag 2013-11-23 12:44:42 +01:00
commit d8c40562ae

View file

@ -540,10 +540,13 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
if(skel->hasBone("BoneOffset")) if(skel->hasBone("BoneOffset"))
{ {
Ogre::Bone *offset = skel->getBone("BoneOffset"); Ogre::Bone *offset = skel->getBone("BoneOffset");
root->translate(offset->getPosition()); root->translate(offset->getPosition());
root->rotate(offset->getOrientation());
// HACK: Why an extra -90 degree rotation? // It appears that the BoneOffset rotation is completely bogus, at least for light models.
//root->rotate(offset->getOrientation());
root->pitch(Ogre::Degree(-90.0f)); root->pitch(Ogre::Degree(-90.0f));
root->scale(offset->getScale()); root->scale(offset->getScale());
root->setInitialState(); root->setInitialState();
} }