From 684187c4ec2e414ec4c36f3a939603ebd22b0de5 Mon Sep 17 00:00:00 2001 From: Garux Date: Sat, 1 Jun 2019 19:25:01 +0300 Subject: [PATCH] fix clipping whole brush by clipper after 3ce07bb3104bf4858fe3db7dbbd6b8420f0f320e fix rotate manipulator selection after aa99f4d2549bd8a3e1188533014088db6942cebc --- radiant/csg.cpp | 5 ++--- radiant/selection.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/radiant/csg.cpp b/radiant/csg.cpp index c774a13c..4b252702 100644 --- a/radiant/csg.cpp +++ b/radiant/csg.cpp @@ -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" ); } else - // the plane does not intersect this brush - if ( !m_split && split.counts[ePlaneBack] != 0 ) { - // the brush is "behind" the plane + // the plane does not intersect this brush and the brush is in front of the plane + if ( !m_split && split.counts[ePlaneFront] != 0 ) { m_gj = true; Path_deleteTop( path ); } diff --git a/radiant/selection.cpp b/radiant/selection.cpp index 9a49afca..d80ae172 100644 --- a/radiant/selection.cpp +++ b/radiant/selection.cpp @@ -1416,11 +1416,11 @@ void testSelect( const View& view, const Matrix4& pivot2world ){ selector.addSelectable( best, &m_selectable_screen ); } - { - SelectionIntersection best; - Circle_BestPoint( local2view, eClipCullCW, m_circle_sphere.m_vertices.data(), m_circle_sphere.m_vertices.size(), best ); - selector.addSelectable( best, &m_selectable_sphere ); - } +// { +// SelectionIntersection best; +// Circle_BestPoint( local2view, eClipCullCW, m_circle_sphere.m_vertices.data(), m_circle_sphere.m_vertices.size(), best ); +// selector.addSelectable( best, &m_selectable_sphere ); +// } } m_axis_screen = m_pivot.m_axis_screen;