From 9ca124bf2fc98026e4e3802f48bcafd0287d809c Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Mon, 30 Nov 2020 11:25:11 +1100
Subject: [PATCH] New UI to show inherited materials from related types

---
 src/ifcblenderexport/blenderbim/bim/prop.py |  4 ++--
 src/ifcblenderexport/blenderbim/bim/ui.py   | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/ifcblenderexport/blenderbim/bim/prop.py b/src/ifcblenderexport/blenderbim/bim/prop.py
index ce8c7ec7cb..780af9cb4e 100644
--- a/src/ifcblenderexport/blenderbim/bim/prop.py
+++ b/src/ifcblenderexport/blenderbim/bim/prop.py
@@ -494,7 +494,7 @@ def getMaterialTypes(self, context):
     global materialtypes_enum
     materialtypes_enum.clear()
     materialtypes_enum = [
-        (m, m, "") for m in ["IfcMaterial", "IfcMaterialConstituentSet", "IfcMaterialLayerSet", "IfcMaterialProfileSet"]
+        (m, m, "") for m in ["None", "IfcMaterial", "IfcMaterialConstituentSet", "IfcMaterialLayerSet", "IfcMaterialProfileSet"]
     ]
     return materialtypes_enum
 
@@ -1646,7 +1646,7 @@ class IfcParameter(PropertyGroup):
 class PsetQto(PropertyGroup):
     name: StringProperty(name="Name")
     properties: CollectionProperty(name="Properties", type=Attribute)
-    is_expanded: BoolProperty(name="Is Expanded")
+    is_expanded: BoolProperty(name="Is Expanded", default=True)
     is_editable: BoolProperty(name="Is Editable")
 
 
diff --git a/src/ifcblenderexport/blenderbim/bim/ui.py b/src/ifcblenderexport/blenderbim/bim/ui.py
index 29d01f79da..42aad30b43 100644
--- a/src/ifcblenderexport/blenderbim/bim/ui.py
+++ b/src/ifcblenderexport/blenderbim/bim/ui.py
@@ -122,7 +122,18 @@ class BIM_PT_object_material(Panel):
         row = layout.row()
         row.prop(props, "material_type")
 
-        if props.material_type == "IfcMaterial":
+        if props.material_type == "None" and props.relating_type:
+            props = props.relating_type.BIMObjectProperties
+            if props.material_type == "None":
+                pass
+            elif props.material_type == "IfcMaterial" and props.material:
+                layout.label(text="Inherited Material:")
+            elif props.material_set:
+                layout.label(text="Inherited Material Set:")
+
+        if props.material_type == "None":
+            pass
+        elif props.material_type == "IfcMaterial":
             row = layout.row()
             row.prop(props, "material")
         else: