quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix clipping whole brush by clipper after 3ce07bb310

Browse Source 
fix rotate manipulator selection after aa99f4d254
This commit is contained in:
Garux 2019-06-01 19:25:01 +03:00
parent aa99f4d254
commit 684187c4ec
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
radiant/csg.cpp
View File

@ -791,9 +791,8 @@ void post( const scene::Path& path, scene::Instance& instance ) const {
ASSERT_MESSAGE( !brush->empty(), "brush left with no faces after split" ); ASSERT_MESSAGE( !brush->empty(), "brush left with no faces after split" );
} }
else else
// the plane does not intersect this brush // the plane does not intersect this brush and the brush is in front of the plane
if ( !m_split && split.counts[ePlaneBack] != 0 ) { if ( !m_split && split.counts[ePlaneFront] != 0 ) {
// the brush is "behind" the plane
m_gj = true; m_gj = true;
Path_deleteTop( path ); Path_deleteTop( path );
} }

10
radiant/selection.cpp
View File

@ -1416,11 +1416,11 @@ void testSelect( const View& view, const Matrix4& pivot2world ){
selector.addSelectable( best, &m_selectable_screen ); selector.addSelectable( best, &m_selectable_screen );
} }
{ // {
SelectionIntersection best; // SelectionIntersection best;
Circle_BestPoint( local2view, eClipCullCW, m_circle_sphere.m_vertices.data(), m_circle_sphere.m_vertices.size(), best ); // Circle_BestPoint( local2view, eClipCullCW, m_circle_sphere.m_vertices.data(), m_circle_sphere.m_vertices.size(), best );
selector.addSelectable( best, &m_selectable_sphere ); // selector.addSelectable( best, &m_selectable_sphere );
} // }
} }
m_axis_screen = m_pivot.m_axis_screen; m_axis_screen = m_pivot.m_axis_screen;