From 7b7f75650604430dd851f653f8d17b686e0483b5 Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Mon, 30 Nov 2020 11:28:32 +1100
Subject: [PATCH] Add support of exporting material sets for construction types

---
 .../blenderbim/bim/export_ifc.py              | 20 +++++++++----------
 .../blenderbim/bim/import_ifc.py              |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ifcblenderexport/blenderbim/bim/export_ifc.py b/src/ifcblenderexport/blenderbim/bim/export_ifc.py
index 3928df32ee..cdc37c5973 100644
--- a/src/ifcblenderexport/blenderbim/bim/export_ifc.py
+++ b/src/ifcblenderexport/blenderbim/bim/export_ifc.py
@@ -68,9 +68,9 @@ class IfcParser:
         self.rel_associates_classification_object = {}
         self.rel_associates_classification_type = {}
         self.rel_associates_material = {}
-        self.rel_associates_material_layer_set = {}
-        self.rel_associates_material_constituent_set = {}
-        self.rel_associates_material_profile_set = {}
+        self.rel_associates_material_layer_set = []
+        self.rel_associates_material_constituent_set = []
+        self.rel_associates_material_profile_set = []
         self.rel_associates_constraint_object = {}
         self.rel_associates_constraint_type = {}
         self.rel_aggregates = {}
@@ -433,11 +433,11 @@ class IfcParser:
         if obj.BIMObjectProperties.material_type == "IfcMaterial" and obj.BIMObjectProperties.material:
             self.rel_associates_material.setdefault(obj.BIMObjectProperties.material.name, []).append(product)
         elif obj.BIMObjectProperties.material_type == "IfcMaterialConstituentSet":
-            self.rel_associates_material_constituent_set[self.product_index] = obj.BIMObjectProperties.material_set
+            self.rel_associates_material_constituent_set.append((obj.BIMObjectProperties.material_set, product))
         elif obj.BIMObjectProperties.material_type == "IfcMaterialLayerSet":
-            self.rel_associates_material_layer_set[self.product_index] = obj.BIMObjectProperties.material_set
+            self.rel_associates_material_layer_set.append((obj.BIMObjectProperties.material_set, product))
         elif obj.BIMObjectProperties.material_type == "IfcMaterialProfileSet":
-            self.rel_associates_material_profile_set[self.product_index] = obj.BIMObjectProperties.material_set
+            self.rel_associates_material_profile_set.append((obj.BIMObjectProperties.material_set, product))
 
         return product
 
@@ -3205,7 +3205,7 @@ class IfcExporter:
             return
         if self.file.schema == "IFC2X3":
             return self.relate_objects_to_material_sets_ifc2x3(set_type)
-        for product_index, material_set in getattr(self.ifc_parser, f"rel_associates_material_{set_type}_set").items():
+        for material_set, product in getattr(self.ifc_parser, f"rel_associates_material_{set_type}_set"):
             if set_type == "constituent":
                 materials = self.create_material_constituents(material_set.material_constituents)
             elif set_type == "layer":
@@ -3231,13 +3231,13 @@ class IfcExporter:
                 self.owner_history,
                 None,
                 None,
-                [self.ifc_parser.products[product_index]["ifc"]],
+                [product["ifc"]],
                 material_set,
             )
 
     def relate_objects_to_material_sets_ifc2x3(self, set_type):
         # IFC2X3 has a very different way of handling materials, so we have a dedicated function
-        for product_index, material_set in getattr(self.ifc_parser, f"rel_associates_material_{set_type}_set").items():
+        for material_set, product in getattr(self.ifc_parser, f"rel_associates_material_{set_type}_set"):
             if set_type == "constituent":
                 # IFC2X3 only supports lists, so we gracefully downgrade
                 material_select = self.file.create_entity(
@@ -3260,7 +3260,7 @@ class IfcExporter:
                 self.owner_history,
                 None,
                 None,
-                [self.ifc_parser.products[product_index]["ifc"]],
+                [product["ifc"]],
                 material_select,
             )
 
diff --git a/src/ifcblenderexport/blenderbim/bim/import_ifc.py b/src/ifcblenderexport/blenderbim/bim/import_ifc.py
index 30dc73097c..adeae61358 100644
--- a/src/ifcblenderexport/blenderbim/bim/import_ifc.py
+++ b/src/ifcblenderexport/blenderbim/bim/import_ifc.py
@@ -45,11 +45,11 @@ class MaterialCreator:
     def create(self, element, obj, mesh):
         self.obj = obj
         self.mesh = mesh
+        self.parse_material(element)
         if (hasattr(element, "Representation") and not element.Representation) or (
             hasattr(element, "RepresentationMaps") and not element.RepresentationMaps
         ):
             return
-        self.parse_material(element)
         if not self.mesh:
             return
         if self.mesh.name in self.parsed_meshes: