From 9877db413ccfaf7d79e8741c3dfe035ae5e7f7c1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 26 Dec 2013 19:49:11 +0100
Subject: [PATCH] Connect particle systems to the particle node, not the
 emitter node

---
 components/nifogre/ogrenifloader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp
index 78f173bba8..7ac101d2b2 100644
--- a/components/nifogre/ogrenifloader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -885,6 +885,10 @@ class NIFObjectLoader
 
         sceneNode->attachObject(partsys);
 
+        int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, partnode->recIndex);
+        Ogre::Bone *trgtbone = scene->mSkelBase->getSkeleton()->getBone(trgtid);
+        trgtbone->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<Ogre::MovableObject*>(partsys)));
+
         Nif::ControllerPtr ctrl = partnode->controller;
         while(!ctrl.empty())
         {
@@ -897,7 +901,6 @@ class NIFObjectLoader
                     int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, partctrl->emitter->recIndex);
                     Ogre::Bone *trgtbone = scene->mSkelBase->getSkeleton()->getBone(trgtid);
                     createParticleEmitterAffectors(partsys, partctrl, trgtbone, scene->mSkelBase->getName());
-                    trgtbone->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<Ogre::MovableObject*>(partsys)));
                 }
 
                 Ogre::ControllerValueRealPtr srcval((partflags&Nif::NiNode::ParticleFlag_AutoPlay) ?