adrien/netradiant-custom
1
Fork 0
mirror of https://github.com/Garux/netradiant-custom.git synced 2026-09-28 00:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't filter empty brushes by filter_brush_all_faces

Browse Source 
case: CSG Intesect: Failed: empty brush deleted = filtered, also after undo
Optimize filter_brush_all_faces, filter_brush_any_face by leaving loops ASAP
This commit is contained in:
Garux
2025-04-02 21:37:00 +05:00
parent 251d8ebd97
commit fba4000c66
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radiant/brushmanip.cpp
+15 -1
View File
@@ -1042,6 +1042,12 @@ public:
filter_brush_any_face( FaceFilter* filter ) : m_filter( filter ){
}
bool filter( const Brush& brush ) const {
#if 1
for( const auto& face : brush )
if( m_filter->filter( *face ) )
return true;
return false;
#else
bool filtered = false;
Brush_forEachFace( brush, [&]( Face& face ){
if ( m_filter->filter( face ) ) {
@@ -1049,6 +1055,7 @@ public:
}
});
return filtered;
#endif
}
};
@@ -1059,13 +1066,20 @@ public:
filter_brush_all_faces( FaceFilter* filter ) : m_filter( filter ){
}
bool filter( const Brush& brush ) const {
bool filtered = true;
#if 1
for( const auto& face : brush )
if( !m_filter->filter( *face ) )
return false;
return !brush.empty(); // don't filter empty brushes
#else
bool filtered = !brush.empty(); // don't filter empty brushes
Brush_forEachFace( brush, [&]( Face& face ){
if ( !m_filter->filter( face ) ) {
filtered = false;
}
});
return filtered;
#endif
}
};