ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 21:40:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'merge_name_fix' into 'master'

Browse Source 
[occ] overwrite shape property name only if not already set in merge

See merge request jschoeberl/netgen!474
This commit is contained in:
Joachim Schöberl 2022-02-14 18:48:59 +00:00
commit 77596aad96
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/meshing/basegeom.hpp
View File

@ -20,8 +20,8 @@ namespace netgen
double hpref = 0; // number of hp refinement levels (will be multiplied by factor later) double hpref = 0; // number of hp refinement levels (will be multiplied by factor later)
void Merge(const ShapeProperties & prop2) void Merge(const ShapeProperties & prop2)
{ {
if (prop2.name) name = prop2.name; if (!name && prop2.name) name = prop2.name;
if (prop2.col) col = prop2.col; if (!col && prop2.col) col = prop2.col;
maxh = min2(maxh, prop2.maxh); maxh = min2(maxh, prop2.maxh);
hpref = max2(hpref, prop2.hpref); hpref = max2(hpref, prop2.hpref);
} }