diff --git a/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py b/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py index 45fb2c5fe2..c7f9ae1f22 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py @@ -28,7 +28,7 @@ class External(svgwrite.container.Group): # Remove namespace ns = u"{http://www.w3.org/2000/svg}" nsl = len(ns) - for elem in self.xml.getiterator(): + for elem in self.xml.iter(): if elem.tag.startswith(ns): elem.tag = elem.tag[nsl:] @@ -85,19 +85,19 @@ class SvgWriter: def add_markers(self): tree = ET.parse(os.path.join(self.data_dir, "templates", "markers.svg")) root = tree.getroot() - for child in root.getchildren(): + for child in root: self.svg.defs.add(External(child)) def add_symbols(self): tree = ET.parse(os.path.join(self.data_dir, "templates", "symbols.svg")) root = tree.getroot() - for child in root.getchildren(): + for child in root: self.svg.defs.add(External(child)) def add_patterns(self): tree = ET.parse(os.path.join(self.data_dir, "templates", "patterns.svg")) root = tree.getroot() - for child in root.getchildren(): + for child in root: self.svg.defs.add(External(child)) def draw_background_image(self): diff --git a/src/blenderbim/blenderbim/bim/operator.py b/src/blenderbim/blenderbim/bim/operator.py index ccf51aee5d..9c6b5b31f7 100644 --- a/src/blenderbim/blenderbim/bim/operator.py +++ b/src/blenderbim/blenderbim/bim/operator.py @@ -5,9 +5,6 @@ import json import logging import webbrowser import ifcopenshell - -# Deleting the below drawing import breaks svgwrite's ElementTree appending because ... magic? -import blenderbim.bim.module.drawing from . import export_ifc from . import import_ifc from . import schema diff --git a/src/ifcopenshell-python/ifcopenshell/api/geometry/add_representation.py b/src/ifcopenshell-python/ifcopenshell/api/geometry/add_representation.py index 16896a254e..1b5c6684a3 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/geometry/add_representation.py +++ b/src/ifcopenshell-python/ifcopenshell/api/geometry/add_representation.py @@ -204,12 +204,12 @@ class Usecase: def create_variable_representation(self): if isinstance(self.settings["geometry"], bpy.types.Curve): return self.create_curve3d_representation() + elif isinstance(self.settings["geometry"], bpy.types.Camera): + return self.create_camera_block_representation() elif not len(self.settings["geometry"].polygons): return self.create_curve3d_representation() elif self.settings["is_point_cloud"]: return self.create_point_cloud_representation() - elif isinstance(self.settings["geometry"], bpy.types.Camera): - return self.create_camera_block_representation() elif self.settings["ifc_representation_class"] == "IfcExtrudedAreaSolid/IfcRectangleProfileDef": return self.create_rectangle_extrusion_representation() elif self.settings["ifc_representation_class"] == "IfcExtrudedAreaSolid/IfcCircleProfileDef":