Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 23536) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 23537) @@ -52,10 +52,6 @@ #include "hid_init.h" #include "plugins.h" - -#include "brave.h" -#include "netlist.h" - static const char *ipcd356_cookie = "ipcd356 exporter"; /*** low level export code ***/ @@ -274,14 +270,10 @@ if (proto == NULL) return; - if (!(pcb_brave & PCB_BRAVE_OLD_NETLIST)) { + { pcb_net_term_t *term = pcb_net_find_by_obj(&ctx->pcb->netlist[PCB_NETLIST_EDITED], (pcb_any_obj_t *)pstk); t.netname = (term == NULL) ? "N/C" : term->parent.net->name; } - else { - pcb_lib_menu_t *mn = pcb_netlist_find_net4term(ctx->pcb, (pcb_any_obj_t *)pstk); - t.netname = (mn == NULL) ? "N/C" : pcb_netlist_name(mn); - } t.o = (pcb_any_obj_t *)pstk; t.refdes = subc->refdes; @@ -319,14 +311,10 @@ memset(t, 0, sizeof(test_feature_t)); - if (!(pcb_brave & PCB_BRAVE_OLD_NETLIST)) { + { pcb_net_term_t *term = pcb_net_find_by_obj(&ctx->pcb->netlist[PCB_NETLIST_EDITED], (pcb_any_obj_t *)o); t->netname = (term == NULL) ? "N/C" : term->parent.net->name; } - else { - pcb_lib_menu_t *mn = pcb_netlist_find_net4term(ctx->pcb, (pcb_any_obj_t *)o); - t->netname = (mn == NULL) ? "N/C" : pcb_netlist_name(mn); - } t->o = o; t->refdes = subc->refdes;