From 2b81da2c50ed1fa8d920c238e939e69e89f05eeb Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Sun, 16 Apr 2023 23:17:56 +1000 Subject: [PATCH] See #2975. Fix bug where custom scales were not loaded correctly. --- src/blenderbim/blenderbim/bim/import_ifc.py | 2 +- src/blenderbim/blenderbim/bim/module/drawing/prop.py | 2 +- src/blenderbim/blenderbim/tool/drawing.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/import_ifc.py b/src/blenderbim/blenderbim/bim/import_ifc.py index c9087bc1bf..b52cbe7377 100644 --- a/src/blenderbim/blenderbim/bim/import_ifc.py +++ b/src/blenderbim/blenderbim/bim/import_ifc.py @@ -1856,7 +1856,7 @@ class IfcImporter: camera.BIMCameraProperties.diagram_scale = valid_scales[0] else: camera.BIMCameraProperties.diagram_scale = "CUSTOM" - camera.BIMCameraProperties.custom_diagram_scale = pset["Scale"] + camera.BIMCameraProperties.custom_diagram_scale = pset["HumanScale"] + "|" + pset["Scale"] if "HasUnderlay" in pset: camera.BIMCameraProperties.has_underlay = pset["HasUnderlay"] if "HasLinework" in pset: diff --git a/src/blenderbim/blenderbim/bim/module/drawing/prop.py b/src/blenderbim/blenderbim/bim/module/drawing/prop.py index 429e49864c..a99cd2f4d2 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/prop.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/prop.py @@ -80,7 +80,7 @@ def update_diagram_scale(self, context): ) except: return - pset = ifcopenshell.util.element.get_psets(element).get("EPset_Drawing") + pset = ifcopenshell.util.element.get_pset(element, "EPset_Drawing") if pset: pset = tool.Ifc.get().by_id(pset["id"]) else: diff --git a/src/blenderbim/blenderbim/tool/drawing.py b/src/blenderbim/blenderbim/tool/drawing.py index f6b7151ea4..a1b84a5e1e 100644 --- a/src/blenderbim/blenderbim/tool/drawing.py +++ b/src/blenderbim/blenderbim/tool/drawing.py @@ -581,7 +581,7 @@ class Drawing(blenderbim.core.tool.Drawing): camera.BIMCameraProperties.diagram_scale = valid_scales[0] else: camera.BIMCameraProperties.diagram_scale = "CUSTOM" - camera.BIMCameraProperties.custom_diagram_scale = pset["Scale"] + camera.BIMCameraProperties.custom_diagram_scale = pset["HumanScale"] + "|" + pset["Scale"] if "HasUnderlay" in pset: camera.BIMCameraProperties.has_underlay = pset["HasUnderlay"] if "HasLinework" in pset: