haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge errors.

This commit is contained in:
Jeff Young 2023-09-02 11:18:28 +01:00
parent 88448ce746
commit 6ca7c3a3a1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/eeschema_config.cpp
View File

@ -164,8 +164,7 @@ void SCH_EDIT_FRAME::saveProjectSettings()
void SCH_EDIT_FRAME::SaveProjectLocalSettings() void SCH_EDIT_FRAME::SaveProjectLocalSettings()
{ {
if( m_schematic ) RecordERCExclusions();
m_schematic->RecordERCExclusions();
} }

2
pcbnew/tools/pad_tool.cpp
View File

@ -870,7 +870,7 @@ std::vector<FP_SHAPE*> PAD_TOOL::RecombinePad( PAD* aPad, bool aIsDryRun, BOARD_
{ {
aCommit.Modify( aPad ); aCommit.Modify( aPad );
if( aPad->GetShape() == PAD_SHAPE::CIRCLE || aPad->GetShape() == PAD_SHAPE::RECTANGLE ) if( aPad->GetShape() == PAD_SHAPE::CIRCLE || aPad->GetShape() == PAD_SHAPE::RECT )
{ {
// Use the existing pad as an anchor // Use the existing pad as an anchor
aPad->SetAnchorPadShape( aPad->GetShape() ); aPad->SetAnchorPadShape( aPad->GetShape() );