more makefile fixes for OS X

[xonotic/netradiant.git] / radiant / textures.cpp

diff --git a/radiant/textures.cpp b/radiant/textures.cpp
index 76a79704679d380a37b190da3724af4e66798be1..ff7d27db39fdcd73f787bbb794fb35e066a7b9cc 100644 (file)
--- a/radiant/textures.cpp
+++ b/radiant/textures.cpp
@@ -91,7 +91,12 @@ texture_globals_t g_texture_globals(GL_RGBA);
 
 void SetTexParameters(ETexturesMode mode)
 {
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0f);
+       float maxAniso = QGL_maxTextureAnisotropy();
+       if(maxAniso > 1)
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0f);
+       else
+               if(mode == eTextures_MAX_ANISOTROPY)
+                       mode = eTextures_LINEAR_MIPMAP_LINEAR;
 
   switch (mode)
   {
@@ -120,7 +125,7 @@ void SetTexParameters(ETexturesMode mode)
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
     break;
   case eTextures_MAX_ANISOTROPY:
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, QGL_maxTextureAnisotropy());
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, maxAniso);
     break;
   default:
     globalOutputStream() << "invalid texture mode\n";