mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-29 04:06:50 +00:00
Code Issues Releases Wiki Activity

Merge branch 'herbalfish' into 'master'

Browse source 
Fix some graphic herbalism issues

See merge request OpenMW/openmw!4624
This commit is contained in:
psi29a 2025-04-07 11:03:55 +00:00
commit bd1c2a11d7
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwclass/container.cpp
View file

@ -237,7 +237,12 @@ namespace MWClass
bool Container::hasToolTip(const MWWorld::ConstPtr& ptr) const
{
if (const MWWorld::CustomData* data = ptr.getRefData().getCustomData())
return !canBeHarvested(ptr) || data->asContainerCustomData().mStore.hasVisibleItems();
{
if (!canBeHarvested(ptr))
return true;
const MWWorld::ContainerStore& store = data->asContainerCustomData().mStore;
return !store.isResolved() || store.hasVisibleItems();
}
return true;
}

1
components/nifosg/nifloader.cpp
View file

@ -391,6 +391,7 @@ namespace NifOsg
osg::ref_ptr<SceneUtil::Skeleton> skel = new SceneUtil::Skeleton;
skel->setStateSet(created->getStateSet());
skel->setName(created->getName());
skel->setUserDataContainer(created->getUserDataContainer());
for (unsigned int i = 0; i < created->getNumChildren(); ++i)
skel->addChild(created->getChild(i));
created->removeChildren(0, created->getNumChildren());