luke/netgen
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/netgen.git synced 2026-08-29 01:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into netgen-1.5

Browse Source
This commit is contained in:
Tim Edwards
2024-05-17 02:00:02 -04:00
parent 5197eb6186 bf4112db07
commit 83fd477a90
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
1.5.275
1.5.276
base/netgen.c
+2 -2
View File
@@ -3094,7 +3094,7 @@ void add_balancing_close(struct objlist *ob1, struct objlist *ob2)
for (nob = ob1->next; nob && nob->type != FIRSTPIN; nob = nob->next)
if (nob->type == PROPERTY)
break;
if (nob->type != PROPERTY) return; // shouldn't happen
if (nob == NULL || nob->type != PROPERTY) return; // shouldn't happen
opentags = 0;
for (; nob->next && nob->next->type == PROPERTY; nob = nob->next) {
@@ -3644,7 +3644,7 @@ int CombineSeries(char *model, int file)
nob->type = PROPERTY;
nob->name = strsave("properties");
nob->node = -2; /* Don't report as disconnected node */
nob->model.class = (obp->model.class == NULL) ? NULL :
nob->model.class = (obp == NULL || obp->model.class == NULL) ? NULL :
strsave(obp->model.class);
nob->instance.props = NewPropValue(2);