Merge branch 'lushemptyplants' into 'master'

Don't display the harvested plant if graphic herbalism is off See merge request OpenMW/openmw!4193
OpenMW · Jun 22, 2024 · 7888a11 · 7888a11
2 parents e88cbf8 + 2edbabd
commit 7888a11
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
@@ -1927,7 +1927,8 @@ namespace MWRender
  mObjectRoot->accept(visitor);
  }
 
- if (ptr.getRefData().getCustomData() != nullptr && ObjectAnimation::canBeHarvested())
+ if (Settings::game().mGraphicHerbalism && ptr.getRefData().getCustomData() != nullptr
+ && ObjectAnimation::canBeHarvested())
  {
  const MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
  if (!store.hasVisibleItems())