From 3896a2eba6da63a227094b1cc38fd3a3e22c4c26 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 30 Sep 2018 11:12:28 +0400
Subject: [PATCH] Do not use a PartHolder for spell effect node

---
 apps/openmw/mwrender/animation.cpp | 5 ++---
 apps/openmw/mwrender/animation.hpp | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 85d4aae9d9..840e59290b 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -624,8 +624,8 @@ namespace MWRender
             }
             else
             {
-                // Remove effect immediately
-                mParams.mObjects.reset();
+                // Hide effect immediately
+                node->setNodeMask(0);
                 mFinished = true;
             }
         }
@@ -1686,7 +1686,6 @@ namespace MWRender
         params.mLoop = loop;
         params.mEffectId = effectId;
         params.mBoneName = bonename;
-        params.mObjects = PartHolderPtr(new PartHolder(node));
         params.mAnimTime = std::shared_ptr<EffectAnimationTime>(new EffectAnimationTime);
         trans->addUpdateCallback(new UpdateVfxCallback(params));
 
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 5828bd52f7..2d8ac152f0 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -74,7 +74,6 @@ typedef std::shared_ptr<PartHolder> PartHolderPtr;
 struct EffectParams
 {
     std::string mModelName; // Just here so we don't add the same effect twice
-    PartHolderPtr mObjects;
     std::shared_ptr<EffectAnimationTime> mAnimTime;
     float mMaxControllerLength;
     int mEffectId;