mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 17:45:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'respect_water_filtering' into 'master'

Browse source 
Simple water should respect filter settings (#5989)

Closes #5989

See merge request OpenMW/openmw!1813
This commit is contained in:
psi29a 2022-04-30 17:02:32 +00:00
commit 265fa51128
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -43,6 +43,7 @@
Bug #5913: Failed assertion during Ritual of Trees quest
Bug #5928: Glow in the Dahrk functionality used without mod installed
Bug #5937: Lights always need to be rotated by 90 degrees
Bug #5989: Simple water isn't affected by texture filter settings
Bug #6037: Morrowind Content Language Cannot be Set to English in OpenMW Launcher
Bug #6051: NaN water height in ESM file is not handled gracefully
Bug #6066: addtopic "return" does not work from within script. No errors thrown

1
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -1243,6 +1243,7 @@ namespace MWRender
);
mTerrain->updateTextureFiltering();
mWater->processChangedSettings({});
mViewer->startThreading();
}

1
apps/openmw/mwrender/water.cpp
View file

@ -596,6 +596,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(mResourceSystem->getImageManager()->getImage(texname.str())));
tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
mResourceSystem->getSceneManager()->applyFilterSettings(tex);
textures.push_back(tex);
}