None texturing filtering enable for android by default

apps/openmw/mwgui/settingswindow.cpp

@@ -35,10 +35,8 @@ namespace
             return "Anisotropic";
         else if (val == "bilinear")
             return "Bilinear";
-        else if (val == "trilinear")
+        else
             return "Trilinear";
-        else if (val == "none")
-            return "None";
     }
 
     void parseResolution (int &x, int &y, const std::string& str)

apps/openmw/mwrender/renderingmanager.cpp

@@ -119,11 +119,14 @@ RenderingManager::RenderingManager(OEngine::Render::OgreRenderer& _rend, const b
     // Set default texture filtering options
     TextureFilterOptions tfo;
     std::string filter = Settings::Manager::getString("texture filtering", "General");
+#ifndef ANDROID
     if (filter == "anisotropic") tfo = TFO_ANISOTROPIC;
     else if (filter == "trilinear") tfo = TFO_TRILINEAR;
     else if (filter == "bilinear") tfo = TFO_BILINEAR;
-    else if (filter == "none") tfo = TFO_NONE;
-
+    else /*if (filter == "none")*/ tfo = TFO_NONE;
+#else
+    tfo = TFO_NONE;
+#endif
     MaterialManager::getSingleton().setDefaultTextureFiltering(tfo);
     MaterialManager::getSingleton().setDefaultAnisotropy( (filter == "anisotropic") ? Settings::Manager::getInt("anisotropy", "General") : 1 );
 

files/mygui/openmw_settings_window.layout

@@ -324,7 +324,6 @@
                             <Property key="AddItem" value="Bilinear"/>
                             <Property key="AddItem" value="Trilinear"/>
                             <Property key="AddItem" value="Anisotropic"/>
-                            <Property key="AddItem" value="None"/>
                         </Widget>
 
                         <Widget type="Widget" skin="" position="184 4 300 50" align="Left Top" name="AnisotropyBox">