mirror of
https://github.com/NGSolve/netgen.git
synced 2025-01-23 03:10:34 +05:00
[occ] also keep color in merge if already set from shape
This commit is contained in:
parent
3ee29a1ace
commit
e2040ae953
@ -21,7 +21,7 @@ namespace netgen
|
|||||||
void Merge(const ShapeProperties & prop2)
|
void Merge(const ShapeProperties & prop2)
|
||||||
{
|
{
|
||||||
if (!name && 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);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user