From e2040ae95332998ed91ebfb665a57026a462580a Mon Sep 17 00:00:00 2001
From: Christopher Lackner <clackner@cerbsim.com>
Date: Mon, 14 Feb 2022 18:24:02 +0100
Subject: [PATCH] [occ] also keep color in merge if already set from shape

---
 libsrc/meshing/basegeom.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsrc/meshing/basegeom.hpp b/libsrc/meshing/basegeom.hpp
index c381de7c..db82c11c 100644
--- a/libsrc/meshing/basegeom.hpp
+++ b/libsrc/meshing/basegeom.hpp
@@ -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);
     }