OpenGL render order appears to be the inverse of the drawing order.
Fixes https://gitlab.com/kicad/code/kicad/issues/13070
This commit is contained in:
parent
294a4804ed
commit
adc5c9eb20
|
@ -856,8 +856,7 @@ void SCH_PAINTER::draw( const LIB_SHAPE *aShape, int aLayer, bool aDimmed )
|
||||||
}
|
}
|
||||||
else if( aLayer == LAYER_DEVICE_BACKGROUND || aLayer == LAYER_NOTES_BACKGROUND )
|
else if( aLayer == LAYER_DEVICE_BACKGROUND || aLayer == LAYER_NOTES_BACKGROUND )
|
||||||
{
|
{
|
||||||
if( aShape->GetFillMode() == FILL_T::FILLED_WITH_BG_BODYCOLOR
|
if( aShape->GetFillMode() == FILL_T::FILLED_WITH_BG_BODYCOLOR )
|
||||||
|| aShape->GetFillMode() == FILL_T::FILLED_WITH_COLOR )
|
|
||||||
{
|
{
|
||||||
m_gal->SetIsFill( true );
|
m_gal->SetIsFill( true );
|
||||||
m_gal->SetIsStroke( false );
|
m_gal->SetIsStroke( false );
|
||||||
|
@ -866,14 +865,6 @@ void SCH_PAINTER::draw( const LIB_SHAPE *aShape, int aLayer, bool aDimmed )
|
||||||
}
|
}
|
||||||
else if( aLayer == LAYER_DEVICE || aLayer == LAYER_PRIVATE_NOTES )
|
else if( aLayer == LAYER_DEVICE || aLayer == LAYER_PRIVATE_NOTES )
|
||||||
{
|
{
|
||||||
if( aShape->GetFillMode() == FILL_T::FILLED_SHAPE
|
|
||||||
|| aShape->GetFillMode() == FILL_T::FILLED_WITH_COLOR )
|
|
||||||
{
|
|
||||||
m_gal->SetIsFill( true );
|
|
||||||
m_gal->SetIsStroke( false );
|
|
||||||
drawShape( aShape );
|
|
||||||
}
|
|
||||||
|
|
||||||
int lineWidth = getLineWidth( aShape, drawingShadows );
|
int lineWidth = getLineWidth( aShape, drawingShadows );
|
||||||
|
|
||||||
if( lineWidth > 0 )
|
if( lineWidth > 0 )
|
||||||
|
@ -908,6 +899,14 @@ void SCH_PAINTER::draw( const LIB_SHAPE *aShape, int aLayer, bool aDimmed )
|
||||||
delete shape;
|
delete shape;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( aShape->GetFillMode() == FILL_T::FILLED_SHAPE
|
||||||
|
|| aShape->GetFillMode() == FILL_T::FILLED_WITH_COLOR )
|
||||||
|
{
|
||||||
|
m_gal->SetIsFill( true );
|
||||||
|
m_gal->SetIsStroke( false );
|
||||||
|
drawShape( aShape );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue