Browse Source

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

newinvert
Marek Roszko 2 years ago
parent
commit
2e58f4ea60
  1. 4
      3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
  2. 2
      3d-viewer/3d_canvas/create_layer_items.cpp
  3. 3
      pcbnew/footprint.cpp

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

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

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

@ -607,7 +607,7 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
case PCB_TEXTBOX_T:
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;
case PCB_DIM_ALIGNED_T:

3
pcbnew/footprint.cpp

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

Loading…
Cancel
Save