From 70fd531722b6e12b27390e9045e683437e0aae87 Mon Sep 17 00:00:00 2001
From: sylar <sylar@debian>
Date: Wed, 8 Oct 2014 00:15:22 +0400
Subject: [PATCH] None texturing filtering enable for android by default

---
 apps/openmw/mwgui/settingswindow.cpp      | 4 +---
 apps/openmw/mwrender/renderingmanager.cpp | 7 +++++--
 files/mygui/openmw_settings_window.layout | 1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index b87154df8..74def66e3 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/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)
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index d449ba0b6..b1e2240ba 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/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 );
 
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index d2aac01d2..fa6485688 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/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">