mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-17 22:13:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'magicfiltering' into 'master'

Browse source 
Apply filtering settings to overriding textures (#8560)

Closes #8560

See merge request OpenMW/openmw!4860
This commit is contained in:
psi29a 2025-08-18 19:26:01 +00:00
commit 80ac098e28
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/util.cpp
View file

@ -6,6 +6,7 @@
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
#include <components/resource/imagemanager.hpp> #include <components/resource/imagemanager.hpp>
#include <components/resource/resourcesystem.hpp> #include <components/resource/resourcesystem.hpp>
#include <components/resource/scenemanager.hpp>
#include <components/sceneutil/texturetype.hpp> #include <components/sceneutil/texturetype.hpp>
#include <components/sceneutil/visitor.hpp> #include <components/sceneutil/visitor.hpp>
#include <components/settings/values.hpp> #include <components/settings/values.hpp>
@ -56,6 +57,7 @@ namespace MWRender
= new osg::Texture2D(resourceSystem->getImageManager()->getImage(correctedTexture)); = new osg::Texture2D(resourceSystem->getImageManager()->getImage(correctedTexture));
tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE); tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE); tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
resourceSystem->getSceneManager()->applyFilterSettings(tex);
osg::ref_ptr<osg::StateSet> stateset; osg::ref_ptr<osg::StateSet> stateset;
if (const osg::StateSet* const src = node.getStateSet()) if (const osg::StateSet* const src = node.getStateSet())