luke
/
netgen
mirror of https://github.com/RTimothyEdwards/netgen.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into netgen-1.5

This commit is contained in:
Tim Edwards 2025-03-26 02:00:02 -04:00
parent ba7004fd5b bbe645f0ab
commit ee93d52a26
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.293 1.5.294

5
base/netgen.c
View File

@ -2248,7 +2248,10 @@ int PromoteProperty(struct property *prop, struct valuelist *vl,
if (prop == NULL || vl == NULL) return -1; if (prop == NULL || vl == NULL) return -1;
if (prop->type == vl->type) return 1; /* Nothing to do */ if (prop->type == vl->type) return 1; /* Nothing to do */
result = 0; result = 0;
if (prop->type == PROP_EXPRESSION) { /* If vl is an expression but prop is not, then try to reduce
* the expression in vl.
*/
if (vl->type == PROP_EXPRESSION) {
ReduceOneExpression(vl, ob, tc, FALSE); ReduceOneExpression(vl, ob, tc, FALSE);
} }
switch (prop->type) { switch (prop->type) {