Remove preferred layer disambiguation for multiple modules.

The preferred list isn't actually in use anymore at this point, so
it currently has no effect other than to mess things up since we
aren't keeping track of which modules have been rejected when we
check the module count.

Fixes https://gitlab.com/kicad/code/kicad/issues/3721

(cherry picked from commit d02c0da3ab)
This commit is contained in:
Jeff Young 2020-02-03 15:44:41 +00:00
parent 8bf8a649c8
commit 9b74bb5c92
1 changed files with 2 additions and 6 deletions

View File

@ -2057,10 +2057,8 @@ void SELECTION_TOOL::guessSelectionCandidates( GENERAL_COLLECTOR& aCollector,
} }
} }
int numZones = aCollector.CountType( PCB_ZONE_AREA_T );
// Zone edges are very specific; zone fills much less so. // Zone edges are very specific; zone fills much less so.
if( numZones > 0 ) if( aCollector.CountType( PCB_ZONE_AREA_T ) > 0 )
{ {
for( int i = aCollector.GetCount() - 1; i >= 0; i-- ) for( int i = aCollector.GetCount() - 1; i >= 0; i-- )
{ {
@ -2148,9 +2146,7 @@ void SELECTION_TOOL::guessSelectionCandidates( GENERAL_COLLECTOR& aCollector,
} }
} }
int moduleCount = aCollector.CountType( PCB_MODULE_T ); if( aCollector.CountType( PCB_MODULE_T ) > 0 )
if( moduleCount > 0 )
{ {
double maxArea = calcMaxArea( aCollector, PCB_MODULE_T ); double maxArea = calcMaxArea( aCollector, PCB_MODULE_T );
BOX2D viewportD = getView()->GetViewport(); BOX2D viewportD = getView()->GetViewport();