From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 3 Aug 2015 16:36:59 +0000 (+0200)
Subject: Also include DarkPlaces texture names in the diffuse map filtering.
X-Git-Tag: xonotic-v0.8.1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8291a081dc25b8e32b4b998b0e356ce8241ebf28;p=xonotic%2Fnetradiant.git

Also include DarkPlaces texture names in the diffuse map filtering.
---

diff --git a/libs/shaderlib.h b/libs/shaderlib.h
index c4e5ba3b..54057ac0 100644
--- a/libs/shaderlib.h
+++ b/libs/shaderlib.h
@@ -51,13 +51,24 @@ bool operator()( const CopiedString& shader, const CopiedString& other ) const {
 };
 
 static inline bool shader_is_diffuse( const char *shader ){
-	return !string_equal_suffix( shader, "_bump" )
-		   && !string_equal_suffix( shader, "_glow" )
-		   && !string_equal_suffix( shader, "_h" )
-		   && !string_equal_suffix( shader, "_local" )
-		   && !string_equal_suffix( shader, "_luma" )
-		   && !string_equal_suffix( shader, "_nm" )
-		   && !string_equal_suffix( shader, "_s" );
+	return
+		/* Quake2World */
+		!string_equal_suffix( shader, "_bump" )
+		&& !string_equal_suffix( shader, "_glow" )
+		&& !string_equal_suffix( shader, "_h" )
+		&& !string_equal_suffix( shader, "_local" )
+		&& !string_equal_suffix( shader, "_luma" )
+		&& !string_equal_suffix( shader, "_nm" )
+		&& !string_equal_suffix( shader, "_s" )
+		/* DarkPlaces */
+		&& !string_equal_suffix( shader, "_norm" )
+		// (already in Quake2World) && !string_equal_suffix( shader, "_bump" )
+		// (already in Quake2World) && !string_equal_suffix( shader, "_glow" )
+		&& !string_equal_suffix( shader, "_gloss" )
+		&& !string_equal_suffix( shader, "_pants" )
+		&& !string_equal_suffix( shader, "_shirt" )
+		&& !string_equal_suffix( shader, "_reflect" )
+		;
 }
 
 inline bool shader_valid( const char* shader ){