From: spog <spog>
Date: Sun, 11 Jun 2006 13:29:52 +0000 (+0000)
Subject: added per-face filtering for caulk shader
X-Git-Tag: xonotic-v0.7.0~16^2~12^2~210
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=1fd4f5bda78021b02f6918e527a4ccf2c3edb85c

added per-face filtering for caulk shader

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@84 8a3a26a2-13c4-0310-b231-cf6edde360e5
---

diff --git a/radiant/brush.h b/radiant/brush.h
index 81d16a62..ab202984 100644
--- a/radiant/brush.h
+++ b/radiant/brush.h
@@ -959,6 +959,7 @@ public:
 };
 
 bool face_filtered(Face& face);
+void add_face_filter(FaceFilter& filter, int mask, bool invert = false);
 
 void Brush_addTextureChangedCallback(const SignalHandler& callback);
 void Brush_textureChanged();
diff --git a/radiant/brushmanip.cpp b/radiant/brushmanip.cpp
index cac0846a..c7b63bf2 100644
--- a/radiant/brushmanip.cpp
+++ b/radiant/brushmanip.cpp
@@ -963,10 +963,10 @@ filter_brush_all_faces g_filter_brush_weapclip(&g_filter_face_weapclip);
 filter_face_shader g_filter_face_botclip("textures/common/botclip");
 filter_brush_all_faces g_filter_brush_botclip(&g_filter_face_botclip);
 
-filter_face_shader g_filter_face_caulk("textures/common/caulk");
+filter_face_shader_prefix g_filter_face_caulk("textures/common/caulk");
 filter_brush_all_faces g_filter_brush_caulk(&g_filter_face_caulk);
 
-filter_face_shader g_filter_face_caulk_ja("textures/system/caulk");
+filter_face_shader_prefix g_filter_face_caulk_ja("textures/system/caulk");
 filter_brush_all_faces g_filter_brush_caulk_ja(&g_filter_face_caulk_ja);
 
 filter_face_shader_prefix g_filter_face_liquids("textures/liquids/");
@@ -1008,6 +1008,8 @@ void BrushFilters_construct()
   add_brush_filter(g_filter_brush_botclip, EXCLUDE_BOTCLIP);
   add_brush_filter(g_filter_brush_caulk, EXCLUDE_CAULK);
   add_brush_filter(g_filter_brush_caulk_ja, EXCLUDE_CAULK);
+  add_face_filter(g_filter_face_caulk, EXCLUDE_CAULK);
+  add_face_filter(g_filter_face_caulk_ja, EXCLUDE_CAULK);
   add_brush_filter(g_filter_brush_liquids, EXCLUDE_LIQUIDS);
   add_brush_filter(g_filter_brush_hint, EXCLUDE_HINTSSKIPS);
   add_brush_filter(g_filter_brush_hint_q2, EXCLUDE_HINTSSKIPS);