From 13a5317863d44366bc1d5341007d68e7e9415aa4 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Sat, 22 Jul 2023 10:36:40 +0500 Subject: [PATCH] Fixed errors after b6ddc0d `element.is_a() in ...` wasn't taking into account spatial classes that inherit from IfcSpatialElement/IfcSpatialStructureElement --- src/blenderbim/blenderbim/tool/geometry.py | 2 +- src/blenderbim/blenderbim/tool/spatial.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blenderbim/blenderbim/tool/geometry.py b/src/blenderbim/blenderbim/tool/geometry.py index 5369741dbb..e5dc383466 100644 --- a/src/blenderbim/blenderbim/tool/geometry.py +++ b/src/blenderbim/blenderbim/tool/geometry.py @@ -101,7 +101,7 @@ class Geometry(blenderbim.core.tool.Geometry): if element.VoidsElements: bpy.ops.bim.remove_opening(opening_id=element.id()) else: - is_spatial = element.is_a() in ("IfcSpatialElement", "IfcSpatialStructureElement") + is_spatial = element.is_a("IfcSpatialElement") or element.is_a("IfcSpatialStructureElement") if getattr(element, "HasOpenings", None): for rel in element.HasOpenings: bpy.ops.bim.remove_opening(opening_id=rel.RelatedOpeningElement.id()) diff --git a/src/blenderbim/blenderbim/tool/spatial.py b/src/blenderbim/blenderbim/tool/spatial.py index 75f5f20110..d6f7270d58 100644 --- a/src/blenderbim/blenderbim/tool/spatial.py +++ b/src/blenderbim/blenderbim/tool/spatial.py @@ -52,7 +52,7 @@ class Spatial(blenderbim.core.tool.Spatial): if not structure.is_a("IfcSpatialStructureElement"): return False else: - if not structure.is_a() in ("IfcSpatialElement", "IfcSpatialStructureElement"): + if not structure.is_a("IfcSpatialElement"): return False if not hasattr(element, "ReferencedInStructures"): return False @@ -204,7 +204,7 @@ class Spatial(blenderbim.core.tool.Spatial): parent = tool.Ifc.get().by_type("IfcProject")[0] for object in ifcopenshell.util.element.get_parts(parent) or []: - if object.is_a() in ("IfcSpatialElement", "IfcSpatialStructureElement"): + if object.is_a("IfcSpatialElement") or object.is_a("IfcSpatialStructureElement"): cls.create_new_storey_li(object, 0) cls.props.is_container_update_enabled = True @@ -223,7 +223,7 @@ class Spatial(blenderbim.core.tool.Spatial): new.has_children = True if new.is_expanded: for related_object in ifcopenshell.util.element.get_parts(element) or []: - if related_object.is_a() in ("IfcSpatialElement", "IfcSpatialStructureElement"): + if related_object.is_a("IfcSpatialElement") or related_object.is_a("IfcSpatialStructureElement"): cls.create_new_storey_li(related_object, level_index + 1) @classmethod