kicad-5.1.7-pcbnew-fix-draw-order.patch

diff -ur a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
--- a/pcbnew/pcb_draw_panel_gal.cpp 2020-10-22 13:22:34.150434273 +0800
+++ b/pcbnew/pcb_draw_panel_gal.cpp 2020-10-22 14:49:46.071736032 +0800
@@ -56,13 +56,18 @@
     LAYER_MOD_TEXT_FR,
     LAYER_MOD_REFERENCES, LAYER_MOD_VALUES,

+   LAYER_GRID,
+
     LAYER_RATSNEST, LAYER_ANCHOR,
     LAYER_VIAS_HOLES, LAYER_PADS_PLATEDHOLES, LAYER_NON_PLATEDHOLES,
     LAYER_VIA_THROUGH, LAYER_VIA_BBLIND,
     LAYER_VIA_MICROVIA, LAYER_PADS_TH,

-    LAYER_PAD_FR_NETNAMES, LAYER_PAD_FR,
-    NETNAMES_LAYER_INDEX( F_Cu ), F_Cu, F_Mask, F_SilkS, F_Paste, F_Adhes, F_CrtYd, F_Fab,
+   F_SilkS, F_CrtYd, F_Fab,
+   LAYER_PAD_FR_NETNAMES,
+   F_Paste, F_Mask, F_Adhes,
+   LAYER_PAD_FR,
+    NETNAMES_LAYER_INDEX( F_Cu ), F_Cu,

     NETNAMES_LAYER_INDEX( In1_Cu ),   In1_Cu,
     NETNAMES_LAYER_INDEX( In2_Cu ),   In2_Cu,
@@ -95,8 +100,11 @@
     NETNAMES_LAYER_INDEX( In29_Cu ),  In29_Cu,
     NETNAMES_LAYER_INDEX( In30_Cu ),  In30_Cu,

-    LAYER_PAD_BK_NETNAMES, LAYER_PAD_BK,
-    NETNAMES_LAYER_INDEX( B_Cu ), B_Cu, B_Mask, B_Adhes, B_Paste, B_SilkS, B_CrtYd, B_Fab,
+    B_SilkS, B_CrtYd, B_Fab,
+   LAYER_PAD_BK_NETNAMES,
+   B_Paste, B_Mask, B_Adhes,
+   LAYER_PAD_BK,
+    NETNAMES_LAYER_INDEX( B_Cu ), B_Cu,

     LAYER_MOD_TEXT_BK,
     LAYER_WORKSHEET
@@ -223,10 +231,13 @@
     // Set display settings for high contrast mode
     KIGFX::RENDER_SETTINGS* rSettings = m_view->GetPainter()->GetSettings();

-    SetTopLayer( aLayer );
+//     SetTopLayer( aLayer );
+
+   setDefaultLayerOrder();

     rSettings->ClearActiveLayers();
     rSettings->SetActiveLayer( aLayer );
+   return;

     if( IsCopperLayer( aLayer ) )
     {
@@ -265,8 +276,9 @@

 void PCB_DRAW_PANEL_GAL::SetTopLayer( PCB_LAYER_ID aLayer )
 {
+   setDefaultLayerOrder();
+   return;
     m_view->ClearTopLayers();
-    setDefaultLayerOrder();
     m_view->SetTopLayer( aLayer );

     // Layers that should always have on-top attribute enabled