Index: trunk/src/plugins/rt_topo/crbs.c =================================================================== --- trunk/src/plugins/rt_topo/crbs.c (revision 1357) +++ trunk/src/plugins/rt_topo/crbs.c (revision 1358) @@ -144,8 +144,6 @@ static void crbs_init(crbs_t *crbs, rtrnd_t *ctx) { - rtrnd_via_t *via; - rtrnd_rtree_it_t it; grbs_init(&crbs->grbs); crbs->ctx = ctx; @@ -155,10 +153,6 @@ crbs->grbs.user_data = crbs; htad_init(&crbs->addrs, htad_hash, grbs_addr_hash_keyeq); - for(via = rtrnd_rtree_all_first(&it, &ctx->board->vias); via != NULL; via = rtrnd_rtree_all_next(&it)) - crbs_make_point(crbs, via->x, via->y, via->dia/2, via->clearance, via); - - } static void crbs_clean(crbs_t *crbs) Index: trunk/src/plugins/rt_topo/crbs_cdt.c =================================================================== --- trunk/src/plugins/rt_topo/crbs_cdt.c (revision 1357) +++ trunk/src/plugins/rt_topo/crbs_cdt.c (revision 1358) @@ -44,9 +44,8 @@ cdt_init(cdt, ctx->board->hdr.bbox.x1, ctx->board->hdr.bbox.y1, ctx->board->hdr.bbox.x2, ctx->board->hdr.bbox.y2); - for(via = rtrnd_rtree_all_first(&it, &ctx->board->vias); via != NULL; via = rtrnd_rtree_all_next(&it)) { - p1 = cdt_insert_point(&crbs->cdt, via->x, via->y); - } + for(via = rtrnd_rtree_all_first(&it, &ctx->board->vias); via != NULL; via = rtrnd_rtree_all_next(&it)) + crbs_make_point(crbs, via->x, via->y, via->dia/2, via->clearance, via); for(obj = rtrnd_rtree_all_first(&it, &ly->objs); obj != NULL; obj = rtrnd_rtree_all_next(&it)) { switch(obj->hdr.type) { @@ -97,10 +96,9 @@ } e->is_constrained = 1; } - for(n = 0; n < np.used; n+=2) { - cdt_insert_point(&crbs->cdt, np.array[n], np.array[n+1]); -/* crbs_make_point(crbs, np.array[n], np.array[n+1], 0, 0, NULL);*/ - } +#warning TODO: this 0.01 should be 0, grbs shoudl support virtual vias + for(n = 0; n < np.used; n+=2) + crbs_make_point(crbs, np.array[n], np.array[n+1], 0.01, 0, NULL); vtd0_uninit(&np); } Index: trunk/src/plugins/rt_topo/crbs_route.c =================================================================== --- trunk/src/plugins/rt_topo/crbs_route.c (revision 1357) +++ trunk/src/plugins/rt_topo/crbs_route.c (revision 1358) @@ -619,8 +619,8 @@ memset(&crbs, 0, sizeof(crbs_t)); crbs.disable_concave = 1; crbs.enable_mid_virt = 1; + crbs_init(&crbs, ctx); rt_topo_crbs_cdt_init(ctx, ly, &crbs); - crbs_init(&crbs, ctx); rtrnd_layer_init(&ly_cdt, "laa"); strcpy(ly_cdt.color, "#888888");