Merge branch 'respect_water_filtering' into 'master'

Simple water should respect filter settings (#5989)

Closes #5989

See merge request OpenMW/openmw!1813

CHANGELOG.md

@@ -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

apps/openmw/mwrender/renderingmanager.cpp

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

apps/openmw/mwrender/water.cpp

@@ -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);
     }