PcbNew: Fix ordering of fab and courtyard layers

Fixes: lp:1829511
* https://bugs.launchpad.net/kicad/+bug/1829511

(cherry picked from commit eb4aded5d6)
This commit is contained in:
Jon Evans 2019-05-27 11:51:27 -04:00
parent cfe588a853
commit 3625668ff5
1 changed files with 4 additions and 4 deletions

View File

@ -62,7 +62,7 @@ const LAYER_NUM GAL_LAYER_ORDER[] =
LAYER_VIA_MICROVIA, LAYER_PADS_TH, LAYER_VIA_MICROVIA, LAYER_PADS_TH,
LAYER_PAD_FR_NETNAMES, LAYER_PAD_FR, LAYER_PAD_FR_NETNAMES, LAYER_PAD_FR,
NETNAMES_LAYER_INDEX( F_Cu ), F_Cu, F_Mask, F_SilkS, F_Paste, F_Adhes, NETNAMES_LAYER_INDEX( F_Cu ), F_Cu, F_Mask, F_SilkS, F_Paste, F_Adhes, F_CrtYd, F_Fab,
NETNAMES_LAYER_INDEX( In1_Cu ), In1_Cu, NETNAMES_LAYER_INDEX( In1_Cu ), In1_Cu,
NETNAMES_LAYER_INDEX( In2_Cu ), In2_Cu, NETNAMES_LAYER_INDEX( In2_Cu ), In2_Cu,
@ -96,7 +96,7 @@ const LAYER_NUM GAL_LAYER_ORDER[] =
NETNAMES_LAYER_INDEX( In30_Cu ), In30_Cu, NETNAMES_LAYER_INDEX( In30_Cu ), In30_Cu,
LAYER_PAD_BK_NETNAMES, LAYER_PAD_BK, LAYER_PAD_BK_NETNAMES, LAYER_PAD_BK,
NETNAMES_LAYER_INDEX( B_Cu ), B_Cu, B_Mask, B_Adhes, B_Paste, B_SilkS, NETNAMES_LAYER_INDEX( B_Cu ), B_Cu, B_Mask, B_Adhes, B_Paste, B_SilkS, B_CrtYd, B_Fab,
LAYER_MOD_TEXT_BK, LAYER_MOD_TEXT_BK,
LAYER_WORKSHEET LAYER_WORKSHEET
@ -278,12 +278,12 @@ void PCB_DRAW_PANEL_GAL::SetTopLayer( PCB_LAYER_ID aLayer )
// Extra layers that are brought to the top if a F.* or B.* is selected // Extra layers that are brought to the top if a F.* or B.* is selected
const std::vector<LAYER_NUM> frontLayers = { const std::vector<LAYER_NUM> frontLayers = {
F_Cu, F_Adhes, F_Paste, F_SilkS, F_Mask, F_Fab, LAYER_PAD_FR, F_Cu, F_Adhes, F_Paste, F_SilkS, F_Mask, F_Fab, F_CrtYd, LAYER_PAD_FR,
LAYER_PAD_FR_NETNAMES, NETNAMES_LAYER_INDEX( F_Cu ) LAYER_PAD_FR_NETNAMES, NETNAMES_LAYER_INDEX( F_Cu )
}; };
const std::vector<LAYER_NUM> backLayers = { const std::vector<LAYER_NUM> backLayers = {
B_Cu, B_Adhes, B_Paste, B_SilkS, B_Mask, B_Fab, LAYER_PAD_BK, B_Cu, B_Adhes, B_Paste, B_SilkS, B_Mask, B_Fab, B_CrtYd, LAYER_PAD_BK,
LAYER_PAD_BK_NETNAMES, NETNAMES_LAYER_INDEX( B_Cu ) LAYER_PAD_BK_NETNAMES, NETNAMES_LAYER_INDEX( B_Cu )
}; };