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

Fix three spots it always failed to check if the border was enabled

This commit is contained in:
Marek Roszko 2023-08-30 22:39:07 -04:00
parent 2dcb7caacf
commit 2e58f4ea60
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
View File

@ -212,7 +212,9 @@ void BOARD_ADAPTER::addFootprintShapes( const FOOTPRINT* aFootprint, CONTAINER_2
if( textbox->GetLayer() == aLayerId ) if( textbox->GetLayer() == aLayerId )
{ {
addShape( textbox, aContainer, aFootprint ); if( textbox->IsBorderEnabled() )
addShape( textbox, aContainer, aFootprint );
addText( textbox, aContainer, aFootprint ); addText( textbox, aContainer, aFootprint );
} }

2
3d-viewer/3d_canvas/create_layer_items.cpp
View File

@ -607,7 +607,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
case PCB_TEXTBOX_T: case PCB_TEXTBOX_T:
addText( static_cast<PCB_TEXTBOX*>( item ), layerContainer, item ); addText( static_cast<PCB_TEXTBOX*>( item ), layerContainer, item );
addShape( static_cast<PCB_TEXTBOX*>( item ), layerContainer, item ); addShape( static_cast<PCB_TEXTBOX*>( item ), layerContainer, item );
break; break;
case PCB_DIM_ALIGNED_T: case PCB_DIM_ALIGNED_T:

3
pcbnew/footprint.cpp
View File

@ -3053,7 +3053,8 @@ void FOOTPRINT::TransformFPShapesToPolySet( SHAPE_POLY_SET& aBuffer, PCB_LAYER_I
if( aLayer != UNDEFINED_LAYER && textbox->GetLayer() == aLayer && textbox->IsVisible() ) if( aLayer != UNDEFINED_LAYER && textbox->GetLayer() == aLayer && textbox->IsVisible() )
{ {
// border // border
textbox->PCB_SHAPE::TransformShapeToPolygon( aBuffer, aLayer, 0, aError, aErrorLoc ); if( textbox->IsBorderEnabled() )
textbox->PCB_SHAPE::TransformShapeToPolygon( aBuffer, aLayer, 0, aError, aErrorLoc );
// text // text
textbox->TransformTextToPolySet( aBuffer, 0, aError, aErrorLoc ); textbox->TransformTextToPolySet( aBuffer, 0, aError, aErrorLoc );
} }