Merge commit '146d231d90b19e2a0edcabff1c4eb9ca44e053e7' into master-merge

diff --cc include/ishaders.h
Simple merge

diff --cc plugins/shaders/shaders.cpp
Simple merge

diff --cc radiant/brushmanip.cpp
index f4c122dd37d24cb8b4ad89229cc5f97a7179ed02,79fde7b931ca55b59dacb817b651272933347640..549e6e87da1ebf6cddc0d5a0cc927d6dbcccfebe
--- 1/radiant/brushmanip.cpp
--- 2/radiant/brushmanip.cpp
+++ b/radiant/brushmanip.cpp
@@@ -865,11 -868,8 +868,11 @@@ filter_brush_any_face g_filter_brush_hi
  filter_face_shader g_filter_face_hint_ja( "textures/system/hint" );
  filter_brush_any_face g_filter_brush_hint_ja( &g_filter_face_hint_ja );
  
 +filter_face_shader g_filter_face_subtlehint( "textures/common/subtlehint" );
 +filter_brush_any_face g_filter_brush_subtlehint( &g_filter_face_subtlehint );
 +
  filter_face_shader g_filter_face_areaportal( "textures/common/areaportal" );
- filter_brush_all_faces g_filter_brush_areaportal( &g_filter_face_areaportal );
+ filter_brush_any_face g_filter_brush_areaportal( &g_filter_face_areaportal );
  
  filter_face_shader g_filter_face_visportal( "textures/editor/visportal" );
  filter_brush_any_face g_filter_brush_visportal( &g_filter_face_visportal );

diff --cc radiant/texwindow.cpp
Simple merge