[occ] also keep color in merge if already set from shape

This commit is contained in:
Christopher Lackner 2022-02-14 18:24:02 +01:00
parent 3ee29a1ace
commit e2040ae953

View File

@ -21,7 +21,7 @@ namespace netgen
void Merge(const ShapeProperties & prop2)
{
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);
hpref = max2(hpref, prop2.hpref);
}