From 3f31c1db538acfbba58f8af6148a1afd3d3c8311 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Tue, 3 Sep 2019 18:42:09 -0300
Subject: [PATCH] Arch: Further fix in material colors

---
 src/Mod/Arch/ArchMaterial.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Mod/Arch/ArchMaterial.py b/src/Mod/Arch/ArchMaterial.py
index 83915b1d0c3e..09e6e6cf2628 100644
--- a/src/Mod/Arch/ArchMaterial.py
+++ b/src/Mod/Arch/ArchMaterial.py
@@ -361,7 +361,7 @@ def execute(self,obj):
                 if "DiffuseColor" in obj.Material:
                     c = tuple([float(f) for f in obj.Material['DiffuseColor'].strip("()").split(",")])
                     for p in obj.InList:
-                        if hasattr(p,"Material"):
+                        if hasattr(p,"Material") and ( (not hasattr(p.ViewObject,"UseMaterialColor")) or p.ViewObject.UseMaterialColor):
                             if p.Material.Name == obj.Name:
                                 p.ViewObject.ShapeColor = c
         return