From 5d852cf6ae5ea82d0aca7079322e81375e830ccd Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Sun, 20 Oct 2019 09:07:46 -0700 Subject: [PATCH] pcbnew: Don't limit editing of the polygons 45 deg contraints are not saved per polygon, so don't limit per polygon. The constraint is only enforced during creation. Fixes: lp:1847722 * https://bugs.launchpad.net/kicad/+bug/1847722 Fixes: lp:1846029 * https://bugs.launchpad.net/kicad/+bug/1846029 (cherry picked from commit 8f1c1cf2984d88e334d4783b422a30a4ad7dfa2f) --- pcbnew/tools/edit_points.h | 11 ----------- pcbnew/tools/point_editor.cpp | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/pcbnew/tools/edit_points.h b/pcbnew/tools/edit_points.h index 58c3757e2a..740ae60316 100644 --- a/pcbnew/tools/edit_points.h +++ b/pcbnew/tools/edit_points.h @@ -492,17 +492,6 @@ public: return m_lines.size(); } - void SetAllowPoints( bool aAllow = true ) - { - m_allowPoints = aAllow; - } - - bool GetAllowPoints() const - { - return m_allowPoints; - } - - ///> @copydoc VIEW_ITEM::ViewBBox() virtual const BOX2I ViewBBox() const override; diff --git a/pcbnew/tools/point_editor.cpp b/pcbnew/tools/point_editor.cpp index a48c73bcbd..c048e8b4aa 100644 --- a/pcbnew/tools/point_editor.cpp +++ b/pcbnew/tools/point_editor.cpp @@ -200,7 +200,6 @@ public: { auto zone = static_cast( aItem ); buildForPolyOutline( points, zone->Outline(), aGal ); - points->SetAllowPoints( !zone->GetHV45() ); break; } @@ -370,8 +369,7 @@ int POINT_EDITOR::OnSelectionChange( const TOOL_EVENT& aEvent ) snapLayers, { item } ) ); // The alternative constraint limits to 45° - bool enableAltConstraint = - ( !!evt->Modifier( MD_CTRL ) || !m_editPoints->GetAllowPoints() ); + bool enableAltConstraint = !!evt->Modifier( MD_CTRL ); if( enableAltConstraint != (bool) m_altConstraint ) // alternative constraint setAltConstraint( enableAltConstraint );