Merge remote branch 'scrawl/settingsfixes'

apps/openmw/mwrender/renderingmanager.cpp

@@ -41,10 +41,11 @@ RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const
     std::string filter = Settings::Manager::getString("texture filtering", "General");
     if (filter == "anisotropic") tfo = TFO_ANISOTROPIC;
     else if (filter == "trilinear") tfo = TFO_TRILINEAR;
-    else /* if (filter == "bilinear") */ tfo = TFO_BILINEAR;
+    else if (filter == "bilinear") tfo = TFO_BILINEAR;
+    else if (filter == "none") tfo = TFO_NONE;
 
     MaterialManager::getSingleton().setDefaultTextureFiltering(tfo);
-    MaterialManager::getSingleton().setDefaultAnisotropy(Settings::Manager::getInt("anisotropy", "General"));
+    MaterialManager::getSingleton().setDefaultAnisotropy( (filter == "anisotropic") ? Settings::Manager::getInt("anisotropy", "General") : 1 );
 
     // Load resources
     ResourceGroupManager::getSingleton().initialiseAllResourceGroups();

files/settings-default.cfg

@@ -1,8 +1,12 @@
+# WARNING: Editing this file might have no effect, as these 
+# settings are overwritten by your user settings file.
+
 [General]
 # Camera field of view
 field of view = 55
 
 # Texture filtering mode. valid values:
+# none
 # anisotropic
 # bilinear
 # trilinear