ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-11 21:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christopher Lackner 2022-02-14 18:07:00 +01:00
parent 6b28275b88
commit 3ee29a1ace
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/meshing/basegeom.hpp
View File

@ -20,7 +20,7 @@ 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 (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);