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 81d16a620f2da298efb1e8c50229e47d058b9bb2..ab2029844d32eaa1a9857c9c97b539dc84411261 100644 (file)
--- 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 cac0846a84d2a5714428aecb80b1ad90cff5ac5b..c7b63bf2e1c035e4aa9ff074084fcecfb106ebe8 100644 (file)
--- 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);