From f75721a217c164787a5f57b823dd78622db1dd77 Mon Sep 17 00:00:00 2001
From: sylar <sylar@debian>
Date: Tue, 7 Oct 2014 23:30:31 +0400
Subject: [PATCH] Add none texture filtering .It is fixes a bug with black
 objects in shaders glsles

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

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 74def66e3..b87154df8 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -35,8 +35,10 @@ namespace
             return "Anisotropic";
         else if (val == "bilinear")
             return "Bilinear";
-        else
+        else if (val == "trilinear")
             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 4fbc55089..d449ba0b6 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -122,7 +122,7 @@ RenderingManager::RenderingManager(OEngine::Render::OgreRenderer& _rend, const b
     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;
 
     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 fa6485688..d2aac01d2 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -324,6 +324,7 @@
                             <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">