From 2db9b91c1000e0ed154f4daf15f7321b4e2c8983 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 5 Jul 2025 17:10:02 +0400
Subject: [PATCH] Do not recreate animation object when harvesting a plant

---
 apps/openmw/mwrender/animation.cpp    | 17 +++++++++++------
 apps/openmw/mwrender/animation.hpp    |  2 ++
 apps/openmw/mwworld/actionharvest.cpp |  9 ++++++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index f07a325f7c..c7ea225d5f 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -2096,12 +2096,17 @@ namespace MWRender
         if (Settings::game().mGraphicHerbalism && ptr.getRefData().getCustomData() != nullptr
             && ObjectAnimation::canBeHarvested())
         {
-            const MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
-            if (!store.hasVisibleItems())
-            {
-                HarvestVisitor visitor;
-                mObjectRoot->accept(visitor);
-            }
+            harvest(ptr);
+        }
+    }
+
+    void ObjectAnimation::harvest(const MWWorld::Ptr& ptr)
+    {
+        const MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
+        if (!store.hasVisibleItems())
+        {
+            HarvestVisitor visitor;
+            mObjectRoot->accept(visitor);
         }
     }
 
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index b6cb6f333c..6e39c44614 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -483,6 +483,7 @@ namespace MWRender
 
         virtual void setAccurateAiming(bool enabled) {}
         virtual bool canBeHarvested() const { return false; }
+        virtual void harvest(const MWWorld::Ptr& ptr) {}
 
         virtual void removeFromScene();
 
@@ -498,6 +499,7 @@ namespace MWRender
             bool animated, bool allowLight);
 
         bool canBeHarvested() const override;
+        void harvest(const MWWorld::Ptr& ptr) override;
     };
 
     class UpdateVfxCallback : public SceneUtil::NodeCallback<UpdateVfxCallback>
diff --git a/apps/openmw/mwworld/actionharvest.cpp b/apps/openmw/mwworld/actionharvest.cpp
index 30f316c2db..1d9e009afe 100644
--- a/apps/openmw/mwworld/actionharvest.cpp
+++ b/apps/openmw/mwworld/actionharvest.cpp
@@ -11,6 +11,8 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwrender/animation.hpp"
+
 #include "class.hpp"
 #include "containerstore.hpp"
 
@@ -89,8 +91,9 @@ namespace MWWorld
                 MWBase::Environment::get().getWindowManager()->messageBox(tooltip);
         }
 
-        // Update animation object
-        MWBase::Environment::get().getWorld()->disable(target);
-        MWBase::Environment::get().getWorld()->enable(target);
+        auto world = MWBase::Environment::get().getWorld();
+        MWRender::Animation* anim = world->getAnimation(target);
+        if (anim != nullptr)
+            anim->harvest(target);
     }
 }