diff --git a/VERSION b/VERSION index 56dd60e..d50ff44 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.177 +1.5.178 diff --git a/base/netcmp.c b/base/netcmp.c index 3a99e0c..ff93caf 100644 --- a/base/netcmp.c +++ b/base/netcmp.c @@ -4851,22 +4851,6 @@ int PropertyOptimize(struct objlist *ob, struct nlist *tp, int run, int series, } } - // Additive properties do not need to be matched, since - // they can be combined. Critical properties must be - // matched. Properties with no merge behavior must match. - - ctype = clist[p][i]; - if (!(ctype & MERGE_S_CRIT)) { - if ((series == TRUE) && (ctype & (MERGE_S_ADD | MERGE_S_PAR))) { - pmatch++; - continue; - } - if ((series == FALSE) && (ctype & (MERGE_P_ADD | MERGE_P_PAR))) { - pmatch++; - continue; - } - } - switch(vl->type) { case PROP_DOUBLE: case PROP_VALUE: