From 9577c40386e34528473f1a8c674de71b1fecb74c Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Sun, 1 May 2022 12:01:24 +1000
Subject: [PATCH] Fix #2107. Materials and styles in the scene manager are now
 shown alphabetically

---
 src/blenderbim/blenderbim/tool/material.py | 15 ++++++++-------
 src/blenderbim/blenderbim/tool/style.py    |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/blenderbim/blenderbim/tool/material.py b/src/blenderbim/blenderbim/tool/material.py
index 9ac4345587..3eef005d8e 100644
--- a/src/blenderbim/blenderbim/tool/material.py
+++ b/src/blenderbim/blenderbim/tool/material.py
@@ -56,15 +56,16 @@ class Material(blenderbim.core.tool.Material):
     def import_material_definitions(cls, material_type):
         props = bpy.context.scene.BIMMaterialProperties
         props.materials.clear()
-        for material in tool.Ifc.get().by_type(material_type):
+        get_name = lambda x: x.Name or "Unnamed"
+        if material_type == "IfcMaterialLayerSet":
+            get_name = lambda x: x.LayerSetName or "Unnamed"
+        elif material_type == "IfcMaterialList":
+            get_name = lambda x: "Unnamed"
+        materials = sorted(tool.Ifc.get().by_type(material_type), key=get_name)
+        for material in materials:
             new = props.materials.add()
             new.ifc_definition_id = material.id()
-            if material.is_a("IfcMaterialLayerSet"):
-                new.name = material.LayerSetName or "Unnamed"
-            elif material.is_a("IfcMaterialList"):
-                new.name = "Unnamed"
-            else:
-                new.name = material.Name or "Unnamed"
+            new.name = get_name(material)
             new.total_elements = len(set(ifcopenshell.util.element.get_elements_by_material(tool.Ifc.get(), material)))
 
     @classmethod
diff --git a/src/blenderbim/blenderbim/tool/style.py b/src/blenderbim/blenderbim/tool/style.py
index caa87ff36c..4c42e0ab57 100644
--- a/src/blenderbim/blenderbim/tool/style.py
+++ b/src/blenderbim/blenderbim/tool/style.py
@@ -183,7 +183,8 @@ class Style(blenderbim.core.tool.Style):
     def import_presentation_styles(cls, style_type):
         props = bpy.context.scene.BIMStylesProperties
         props.styles.clear()
-        for style in tool.Ifc.get().by_type(style_type):
+        styles = sorted(tool.Ifc.get().by_type(style_type), key=lambda x: x.Name or "Unnamed")
+        for style in styles:
             new = props.styles.add()
             new.ifc_definition_id = style.id()
             new.name = style.Name or "Unnamed"