mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-24 21:10:33 +05:00
[occ] overwrite shape property name only if not already set in merge
This commit is contained in:
parent
6b28275b88
commit
3ee29a1ace
@ -20,7 +20,7 @@ namespace netgen
|
||||
double hpref = 0; // number of hp refinement levels (will be multiplied by factor later)
|
||||
void Merge(const ShapeProperties & prop2)
|
||||
{
|
||||
if (prop2.name) name = prop2.name;
|
||||
if (!name && prop2.name) name = prop2.name;
|
||||
if (prop2.col) col = prop2.col;
|
||||
maxh = min2(maxh, prop2.maxh);
|
||||
hpref = max2(hpref, prop2.hpref);
|
||||
|
Loading…
Reference in New Issue
Block a user