Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 7739) +++ trunk/src/crosshair.c (revision 7740) @@ -1294,8 +1294,8 @@ /* find layer groups of the component side and solder side */ SLayer = CLayer = -1; - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &SLayer, 1); - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &CLayer, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &SLayer, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &CLayer, 1); desired_group = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? SLayer : CLayer; if (desired_group >= 0) { Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 7739) +++ trunk/src/draw.c (revision 7740) @@ -143,7 +143,7 @@ { pcb_layergrp_id_t side_group; - if (pcb_layer_group_list(PCB_LYT_COPPER | lyt_side, &side_group, 1) != 1) + if (pcb_layer_group_list(PCB, PCB_LYT_COPPER | lyt_side, &side_group, 1) != 1) return; pcb_draw_doing_assy = pcb_true; @@ -206,8 +206,8 @@ } solder = component = -1; - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder, 1); - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &component, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &component, 1); /* * first draw all 'invisible' stuff @@ -258,7 +258,7 @@ } /* Draw silks */ - slk_len = pcb_layer_group_list(PCB_LYT_SILK, slk, sizeof(slk) / sizeof(slk[0])); + slk_len = pcb_layer_group_list(PCB, PCB_LYT_SILK, slk, sizeof(slk) / sizeof(slk[0])); for(i = 0; i < slk_len; i++) { if (pcb_layer_gui_set_glayer(slk[i], 0)) { unsigned int loc = pcb_layergrp_flags(PCB, slk[i]); Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 7739) +++ trunk/src/layer.c (revision 7740) @@ -613,8 +613,8 @@ /* insert the new layer into the top copper group (or if that fails, in any copper group) */ gid = -1; - if (pcb_layer_group_list(PCB_LYT_COPPER | PCB_LYT_TOP, &gid, 1) < 1) - pcb_layer_group_list(PCB_LYT_COPPER, &gid, 1); + if (pcb_layer_group_list(PCB, PCB_LYT_COPPER | PCB_LYT_TOP, &gid, 1) < 1) + pcb_layer_group_list(PCB, PCB_LYT_COPPER, &gid, 1); lp->grp = gid; for (l = 0; l < pcb_max_layer; l++) Index: trunk/src/layer_grp.c =================================================================== --- trunk/src/layer_grp.c (revision 7739) +++ trunk/src/layer_grp.c (revision 7740) @@ -502,21 +502,21 @@ used++; \ } while(0) -int pcb_layer_group_list(pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len) +int pcb_layer_group_list(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len) { int group, used = 0; for (group = 0; group < pcb_max_group; group++) { - if ((pcb_layergrp_flags(PCB, group) & mask) == mask) + if ((pcb_layergrp_flags(pcb, group) & mask) == mask) APPEND(group); } return used; } -int pcb_layer_group_list_any(pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len) +int pcb_layer_group_list_any(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len) { int group, used = 0; for (group = 0; group < pcb_max_group; group++) { - if ((pcb_layergrp_flags(PCB, group) & mask)) + if ((pcb_layergrp_flags(pcb, group) & mask)) APPEND(group); } return used; Index: trunk/src/layer_grp.h =================================================================== --- trunk/src/layer_grp.h (revision 7739) +++ trunk/src/layer_grp.h (revision 7740) @@ -76,8 +76,8 @@ /* Same as pcb_layer_list but lists layer groups. A group is matching if any layer in that group matches mask. */ -int pcb_layer_group_list(pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len); -int pcb_layer_group_list_any(pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len); +int pcb_layer_group_list(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len); +int pcb_layer_group_list_any(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len); /* Put a layer in a group (the layer should not be in any other group); returns 0 on success */ Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 7739) +++ trunk/src/obj_elem.c (revision 7740) @@ -206,8 +206,8 @@ PCB_END_LOOP; gbottom = gtop = -1; - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gbottom, 1); - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, >op, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gbottom, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, >op, 1); group = (PCB_SWAP_IDENT ? gbottom : gtop); clayer = &Buffer->Data->Layer[PCB->LayerGroups.grp[group].lid[0]]; @@ -268,8 +268,8 @@ pcb_bool warned = pcb_false; gbottom = gtop = -1; - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gbottom, 1); - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, >op, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gbottom, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, >op, 1); if (Buffer->Data->pcb == 0) Buffer->Data->pcb = PCB; Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 7739) +++ trunk/src/polygon.c (revision 7740) @@ -1543,8 +1543,8 @@ pcb_layergrp_id_t SLayer, CLayer, group; SLayer = CLayer = -1; - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &SLayer, 1); - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &CLayer, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &SLayer, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &CLayer, 1); group = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? SLayer : CLayer; PCB_COPPER_GROUP_LOOP(Data, group); { Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 7739) +++ trunk/src/rats.c (revision 7740) @@ -196,8 +196,8 @@ /* find layer groups of the component side and solder side */ Sgrp = Cgrp = -1; - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &Sgrp, 1); - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &Cgrp, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &Sgrp, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &Cgrp, 1); Wantlist = (pcb_netlist_t *) calloc(1, sizeof(pcb_netlist_t)); if (Wantlist) { @@ -832,8 +832,8 @@ } Sgrp = Cgrp = -1; - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &Sgrp, 1); - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &Cgrp, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &Sgrp, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &Cgrp, 1); /* will work for pins to since the FLAG is common */ group1 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? Sgrp : Cgrp); Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 7739) +++ trunk/src_plugins/autoplace/autoplace.c (revision 7740) @@ -145,8 +145,8 @@ pcb_cardinal_t i, j; /* find layer groups of the component side and solder side */ - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &SLayer, 1); - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &CLayer, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &SLayer, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &CLayer, 1); /* update all nets */ for (i = 0; i < Nets->NetN; i++) { Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 7739) +++ trunk/src_plugins/autoroute/autoroute.c (revision 7740) @@ -875,9 +875,9 @@ AutoRouteParameters.use_vias = routing_layers > 1 && PCB->ViaOn; back = front = -1; - if (pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &back, 1) <= 0) + if (pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &back, 1) <= 0) return NULL; - if (pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &front, 1) <= 0) + if (pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &front, 1) <= 0) return NULL; /* determine preferred routing direction on each group */ Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 7739) +++ trunk/src_plugins/diag/diag.c (revision 7740) @@ -168,7 +168,7 @@ } /* query by groups (physical layers): any copper in group */ - used = pcb_layer_group_list(PCB_LYT_COPPER, garr, sizeof(garr)/sizeof(garr[0])); + used = pcb_layer_group_list(PCB, PCB_LYT_COPPER, garr, sizeof(garr)/sizeof(garr[0])); printf("All %d groups containing copper layers are:\n", used); for(g = 0; g < used; g++) { pcb_layergrp_id_t group_id = garr[g]; Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 7739) +++ trunk/src_plugins/export_bboard/bboard.c (revision 7740) @@ -499,10 +499,10 @@ memset(group_data, 0, sizeof(group_data)); - if (pcb_layer_group_list(PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gbottom, 1) > 0) + if (pcb_layer_group_list(PCB, PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gbottom, 1) > 0) group_data[gbottom].solder = 1; - if (pcb_layer_group_list(PCB_LYT_COPPER | PCB_LYT_TOP, >op, 1) > 0) + if (pcb_layer_group_list(PCB, PCB_LYT_COPPER | PCB_LYT_TOP, >op, 1) > 0) group_data[gtop].component = 1; for (i = 0; i < pcb_max_layer; i++) { Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 7739) +++ trunk/src_plugins/export_dsn/dsn.c (revision 7740) @@ -151,8 +151,8 @@ pcb_layergrp_id_t group, top_group, bot_group; pcb_layer_id_t top_layer, bot_layer; - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &top_group, 1); - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &bot_group, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &top_group, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &bot_group, 1); top_layer = PCB->LayerGroups.grp[top_group].lid[0]; bot_layer = PCB->LayerGroups.grp[bot_group].lid[0]; Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 7739) +++ trunk/src_plugins/export_openscad/scad.c (revision 7740) @@ -538,10 +538,10 @@ memset(group_data, 0, sizeof(group_data)); - if (pcb_layer_group_list(PCB_LYT_SILK | PCB_LYT_BOTTOM, &gbottom, 1) > 0) + if (pcb_layer_group_list(PCB, PCB_LYT_SILK | PCB_LYT_BOTTOM, &gbottom, 1) > 0) group_data[gbottom].solder = 1; - if (pcb_layer_group_list(PCB_LYT_SILK | PCB_LYT_TOP, >op, 1) > 0) + if (pcb_layer_group_list(PCB, PCB_LYT_SILK | PCB_LYT_TOP, >op, 1) > 0) group_data[gtop].component = 1; for (i = 0; i < pcb_max_layer; i++) { Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 7739) +++ trunk/src_plugins/export_png/png.c (revision 7740) @@ -466,8 +466,8 @@ int i, n = 0; pcb_layergrp_id_t solder_layer = -1, comp_layer = -1; - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_layer, 1); - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &comp_layer, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_layer, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &comp_layer, 1); assert(solder_layer >= 0); assert(comp_layer >= 0); Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 7739) +++ trunk/src_plugins/export_ps/eps.c (revision 7740) @@ -227,7 +227,7 @@ layer to get the pins. */ if (fast_erase == 0) { pcb_layergrp_id_t comp_copp; - if (pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &comp_copp, 1) > 0) { + if (pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &comp_copp, 1) > 0) { print_group[pcb_layer_get_group(PCB, comp_copp)] = 1; fast_erase = 1; } Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 7739) +++ trunk/src_plugins/fontmode/fontmode.c (revision 7740) @@ -140,13 +140,13 @@ pcb_get_grp_new_intern(PCB, &PCB->LayerGroups, 1); pcb_get_grp_new_intern(PCB, &PCB->LayerGroups, 2); - assert(pcb_layer_group_list(PCB_LYT_COPPER, grp, 4) == 4); + assert(pcb_layer_group_list(PCB, PCB_LYT_COPPER, grp, 4) == 4); lfont = make_layer(grp[0], "Font"); lorig = make_layer(grp[1], "OrigFont"); lwidth = make_layer(grp[2], "Width"); lgrid = make_layer(grp[3], "Grid"); - assert(pcb_layer_group_list(PCB_LYT_SILK, grp, 2) == 2); + assert(pcb_layer_group_list(PCB, PCB_LYT_SILK, grp, 2) == 2); make_layer(grp[0], "Silk"); lsilk = make_layer(grp[1], "Silk"); Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 7739) +++ trunk/src_plugins/hid_lesstif/main.c (revision 7740) @@ -585,10 +585,10 @@ int solder_layer; int comp_showing = 0, solder_showing = 0; - if (pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_group, 1) > 0) + if (pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_group, 1) > 0) solder_showing = group_showing(solder_group, &solder_layer); - if (pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &comp_group, 1) > 0) + if (pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &comp_group, 1) > 0) comp_showing = group_showing(comp_group, &comp_layer); if (argc > 0) { Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 7739) +++ trunk/src_plugins/hid_remote/remote.c (revision 7740) @@ -66,7 +66,7 @@ pcb_layergrp_id_t garr[128]; int n, used; - used = pcb_layer_group_list_any(PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE | PCB_LYT_VIRTUAL, garr, sizeof(garr)/sizeof(garr[0])); + used = pcb_layer_group_list_any(PCB, PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE | PCB_LYT_VIRTUAL, garr, sizeof(garr)/sizeof(garr[0])); for(n = 0; n < used; n++) { pcb_layergrp_id_t gid = garr[n]; pcb_remote_new_layer_group(pcb_layergrp_name(PCB, gid), gid, pcb_layergrp_flags(PCB, gid)); Index: trunk/src_plugins/import_hyp/parser.c =================================================================== --- trunk/src_plugins/import_hyp/parser.c (revision 7739) +++ trunk/src_plugins/import_hyp/parser.c (revision 7740) @@ -769,25 +769,25 @@ /* set up dual layer board: top and bottom copper and silk */ id = -1; - if (pcb_layer_group_list(PCB_LYT_SILK | PCB_LYT_TOP, &gid, 1) == 1) + if (pcb_layer_group_list(PCB, PCB_LYT_SILK | PCB_LYT_TOP, &gid, 1) == 1) id = pcb_layer_create(gid, pcb_strdup("top silk")); if (id < 0) pcb_printf("failed to create top silk\n"); id = -1; - if (pcb_layer_group_list(PCB_LYT_SILK | PCB_LYT_BOTTOM, &gid, 1) == 1) + if (pcb_layer_group_list(PCB, PCB_LYT_SILK | PCB_LYT_BOTTOM, &gid, 1) == 1) id = pcb_layer_create(gid, pcb_strdup("bottom silk")); if (id < 0) pcb_printf("failed to create bottom silk\n"); top_layer_id = -1; - if (pcb_layer_group_list(PCB_LYT_COPPER | PCB_LYT_TOP, &gid, 1) == 1) + if (pcb_layer_group_list(PCB, PCB_LYT_COPPER | PCB_LYT_TOP, &gid, 1) == 1) top_layer_id = pcb_layer_create(gid, NULL); if (top_layer_id < 0) pcb_printf("failed to create top copper\n"); bottom_layer_id = -1; - if (pcb_layer_group_list(PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gid, 1) == 1) + if (pcb_layer_group_list(PCB, PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gid, 1) == 1) bottom_layer_id = pcb_layer_create(gid, NULL); if (bottom_layer_id < 0) pcb_printf("failed to create bottom copper\n"); @@ -861,7 +861,7 @@ default: /* create new bottom layer */ - pcb_layer_group_list(PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gid, 1); layer_id = pcb_layer_create(gid, lname); /* check if new bottom layer valid */ Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 7739) +++ trunk/src_plugins/io_kicad/read.c (revision 7740) @@ -896,13 +896,13 @@ switch(lnum) { case 0: /*pcb_hid_actionl("dumpcsect", NULL);*/ - pcb_layer_group_list(PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gid, 1); id = pcb_layer_create(gid, lname); /*printf("------------------------------\n"); pcb_hid_actionl("dumpcsect", NULL);*/ break; case 15: - pcb_layer_group_list(PCB_LYT_COPPER | PCB_LYT_TOP, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_COPPER | PCB_LYT_TOP, &gid, 1); id = pcb_layer_create(gid, lname); break; default: @@ -953,7 +953,7 @@ pcb_layer_id_t id; if (pcb_layer_list(mask, &id, 1) != 1) { pcb_layergrp_id_t gid; - pcb_layer_group_list(mask, &gid, 1); + pcb_layer_group_list(PCB, mask, &gid, 1); id = pcb_layer_create(gid, kicad_name); } htsi_set(&st->layer_k2i, pcb_strdup(kicad_name), id); Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 7739) +++ trunk/src_plugins/io_kicad/write.c (revision 7740) @@ -171,7 +171,7 @@ } /* here we define the copper layers in the exported kicad file */ - physicalLayerCount = pcb_layer_group_list(PCB_LYT_COPPER, NULL, 0); + physicalLayerCount = pcb_layer_group_list(PCB, PCB_LYT_COPPER, NULL, 0); fprintf(FP, "\n%*s(layers\n", baseSExprIndent, ""); kicadLayerCount = physicalLayerCount; Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 7739) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 7740) @@ -173,7 +173,7 @@ fputs("InternalUnit 0.000100 INCH\n",FP); /* decimil is the default v1 kicad legacy unit */ /* here we define the copper layers in the exported kicad file */ - physicalLayerCount = pcb_layer_group_list(PCB_LYT_COPPER, NULL, 0); + physicalLayerCount = pcb_layer_group_list(PCB, PCB_LYT_COPPER, NULL, 0); fputs("Layers ",FP); kicadLayerCount = physicalLayerCount; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 7739) +++ trunk/src_plugins/io_pcb/file.c (revision 7740) @@ -695,9 +695,9 @@ for(lid = 0; lid < pcb->Data->LayerN; lid++) { if (strcmp(pcb->Data->Layer[lid].Name, "silk") == 0) { if (silk < 0) - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_SILK, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_SILK, &gid, 1); else - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_SILK, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_SILK, &gid, 1); pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid); silk = lid; } @@ -707,14 +707,14 @@ pcb->Data->Layer[lid].Name = pcb_strdup("anonymous"); } if (lid == 0) - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &gid, 1); else - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gid, 1); pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid); } } - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_SILK, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_SILK, &gid, 1); if (pcb->LayerGroups.grp[gid].len < 1) { lid = new_ly_end(pcb, "silk"); if (lid < 0) @@ -722,7 +722,7 @@ pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid); } - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_SILK, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_SILK, &gid, 1); if (pcb->LayerGroups.grp[gid].len < 1) { lid = new_ly_end(pcb, "silk"); if (lid < 0) @@ -730,7 +730,7 @@ pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid); } - pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &gid, 1); if (pcb->LayerGroups.grp[gid].len < 1) { lid = new_ly_old(pcb, "top_copper"); if (lid < 0) @@ -738,7 +738,7 @@ pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid); } - pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gid, 1); + pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gid, 1); if (pcb->LayerGroups.grp[gid].len < 1) { lid = new_ly_old(pcb, "bottom_copper"); if (lid < 0) Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.c =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 7739) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 7740) @@ -355,10 +355,10 @@ pcb_layergrp_id_t comp_group = -1, solder_group = -1; pcb_bool comp_on = pcb_false, solder_on = pcb_false; - if (pcb_layer_group_list(PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_group, 1) > 0) + if (pcb_layer_group_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_group, 1) > 0) solder_on = LAYER_PTR(PCB->LayerGroups.grp[solder_group].lid[0])->On; - if (pcb_layer_group_list(PCB_LYT_TOP | PCB_LYT_COPPER, &comp_group, 1) > 0) + if (pcb_layer_group_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &comp_group, 1) > 0) comp_on = LAYER_PTR(PCB->LayerGroups.grp[comp_group].lid[0])->On; pcb_draw_inhibit_inc(); Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 7739) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 7740) @@ -247,7 +247,7 @@ info.line = NULL; info.rbnd = rbnd; flg = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? PCB_LYT_BOTTOM : PCB_LYT_TOP; - if (pcb_layer_group_list(flg | PCB_LYT_COPPER, &group, 1) < 1) + if (pcb_layer_group_list(PCB, flg | PCB_LYT_COPPER, &group, 1) < 1) return; /* check all visible layers in the same group */ @@ -321,7 +321,7 @@ pcb_layergrp_id_t group; flg = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Pad) ? PCB_LYT_BOTTOM : PCB_LYT_TOP; - if (pcb_layer_group_list(flg | PCB_LYT_COPPER, &group, 1) < 1) + if (pcb_layer_group_list(PCB, flg | PCB_LYT_COPPER, &group, 1) < 1) return; info.group = group;