X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ftexwindow.cpp;h=51903700b9ebc55676e7f3c1d0b0e450fb5e293c;hb=0c748cb13b9eee76674ef72fa4751590ee223956;hp=e6afb71df3fd16eeae61d3b577ae76d33b6060c7;hpb=02a51890a3d97a0e937fbb11071cf7c41cc00aa9;p=xonotic%2Fnetradiant.git

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index e6afb71d..51903700 100644
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -31,7 +31,8 @@
 
 #include "debugging/debugging.h"
 #include "warnings.h"
-
+ 
+#include "defaults.h"
 #include "ifilesystem.h"
 #include "iundo.h"
 #include "igl.h"
@@ -86,9 +87,6 @@
 #include "shaders.h"
 #include "commands.h"
 
-#define NOTEX_BASENAME "notex"
-#define SHADERNOTEX_BASENAME "shadernotex"
-
 bool TextureBrowser_showWads()
 {
     return !string_empty(g_pGameDescription->getKeyValue("show_wads"));
@@ -145,10 +143,10 @@ bool isMissing(const char *name)
 
 bool isNotex(const char *name)
 {
-    if (string_equal_suffix(name, "/" NOTEX_BASENAME)) {
+    if (string_equal_suffix(name, "/" DEFAULT_NOTEX_BASENAME)) {
         return true;
     }
-    if (string_equal_suffix(name, "/" SHADERNOTEX_BASENAME)) {
+    if (string_equal_suffix(name, "/" DEFAULT_SHADERNOTEX_BASENAME)) {
         return true;
     }
     return false;
@@ -775,14 +773,27 @@ bool texture_name_ignore(const char *name)
             endswith(strTemp.c_str(), ".diffuse") ||
             endswith(strTemp.c_str(), ".blend") ||
             endswith(strTemp.c_str(), ".alpha") ||
-            endswith(strTemp.c_str(), "_norm") ||
+            endswith(strTemp.c_str(), "_alpha") ||
+            /* Quetoo */
+            endswith(strTemp.c_str(), "_h") ||
+            endswith(strTemp.c_str(), "_local") ||
+            endswith(strTemp.c_str(), "_nm") ||
+            endswith(strTemp.c_str(), "_s") ||
+            /* DarkPlaces */
             endswith(strTemp.c_str(), "_bump") ||
             endswith(strTemp.c_str(), "_glow") ||
             endswith(strTemp.c_str(), "_gloss") ||
+            endswith(strTemp.c_str(), "_luma") ||
+            endswith(strTemp.c_str(), "_norm") ||
             endswith(strTemp.c_str(), "_pants") ||
             endswith(strTemp.c_str(), "_shirt") ||
             endswith(strTemp.c_str(), "_reflect") ||
-            endswith(strTemp.c_str(), "_alpha") ||
+            /* Unvanquished */
+            endswith(strTemp.c_str(), "_d") ||
+            endswith(strTemp.c_str(), "_n") ||
+            endswith(strTemp.c_str(), "_p") ||
+            endswith(strTemp.c_str(), "_g") ||
+            endswith(strTemp.c_str(), "_a") ||
             0;
 }
 
@@ -2078,13 +2089,14 @@ void TextureBrowser_checkTagFile()
 
 void TextureBrowser_SetNotex()
 {
-    StringOutputStream name(256);
-    name << GlobalRadiant().getAppPath() << "bitmaps/" NOTEX_BASENAME ".png";
-    g_notex = name.c_str();
+	IShader *notex = QERApp_Shader_ForName(DEFAULT_NOTEX_NAME);
+	IShader *shadernotex = QERApp_Shader_ForName(DEFAULT_SHADERNOTEX_NAME);
+
+    g_notex = notex->getTexture()->name;
+    g_shadernotex = shadernotex->getTexture()->name;
 
-    name = StringOutputStream(256);
-    name << GlobalRadiant().getAppPath() << "bitmaps/" SHADERNOTEX_BASENAME " .png";
-    g_shadernotex = name.c_str();
+	notex->DecRef();
+	shadernotex->DecRef();
 }
 
 ui::Widget TextureBrowser_constructWindow(ui::Window toplevel)