From c01153569d25f5f408d2b32202e2707adc8d1d2d Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sat, 4 May 2019 12:36:58 +0400
Subject: [PATCH] Add missing Organic flag check for herbalism

---
 apps/openmw/mwrender/animation.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 8537060f6..2de39aee4 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1990,9 +1990,7 @@ namespace MWRender
             mObjectRoot->accept(visitor);
         }
 
-        if (ptr.getTypeName() == typeid(ESM::Container).name() &&
-            SceneUtil::hasUserDescription(mObjectRoot, Constants::HerbalismLabel) &&
-            ptr.getRefData().getCustomData() != nullptr)
+        if (ptr.getRefData().getCustomData() != nullptr && canBeHarvested())
         {
             const MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
             if (!store.hasVisibleItems())