From 93a1355c5ed8d430d29f3995488b0cdeff1bf351 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Thu, 18 Jul 2024 14:05:40 +1000 Subject: [PATCH] Fix missing imports prior to deciding 4.2 import strategy --- src/blenderbim/blenderbim/bim/__init__.py | 1 - src/blenderbim/blenderbim/bim/module/drawing/operator.py | 3 +++ src/blenderbim/blenderbim/bim/module/drawing/workspace.py | 1 + src/blenderbim/blenderbim/bim/module/model/door.py | 1 - src/blenderbim/blenderbim/bim/module/model/railing.py | 3 +-- src/blenderbim/blenderbim/bim/module/model/roof.py | 1 - src/blenderbim/blenderbim/bim/module/model/stair.py | 1 - src/blenderbim/blenderbim/bim/module/sequence/prop.py | 2 +- src/blenderbim/blenderbim/bim/module/void/operator.py | 1 + 9 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/__init__.py b/src/blenderbim/blenderbim/bim/__init__.py index c8eea106dd..5e078307a9 100644 --- a/src/blenderbim/blenderbim/bim/__init__.py +++ b/src/blenderbim/blenderbim/bim/__init__.py @@ -19,7 +19,6 @@ import os import bpy import bpy.utils.previews -import blenderbim import importlib from pathlib import Path from . import handler, ui, prop, operator, helper diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py index 0d9805a0d0..80558d6491 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py @@ -36,7 +36,10 @@ import ifcopenshell.util.selector import ifcopenshell.util.representation import ifcopenshell.util.element import blenderbim.bim.schema +import blenderbim.bim.helper +import blenderbim.bim.handler import blenderbim.tool as tool +import blenderbim.core.geometry import blenderbim.core.drawing as core import blenderbim.bim.module.drawing.svgwriter as svgwriter import blenderbim.bim.module.drawing.annotation as annotation diff --git a/src/blenderbim/blenderbim/bim/module/drawing/workspace.py b/src/blenderbim/blenderbim/bim/module/drawing/workspace.py index 66e238c9d9..a0cb1f4519 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/workspace.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/workspace.py @@ -19,6 +19,7 @@ import os import bpy +import blenderbim.core.type import blenderbim.tool as tool from blenderbim.bim.helper import prop_with_search from bpy.types import WorkSpaceTool diff --git a/src/blenderbim/blenderbim/bim/module/model/door.py b/src/blenderbim/blenderbim/bim/module/model/door.py index e971a5015d..69d45bc714 100644 --- a/src/blenderbim/blenderbim/bim/module/model/door.py +++ b/src/blenderbim/blenderbim/bim/module/model/door.py @@ -26,7 +26,6 @@ import ifcopenshell.api import ifcopenshell.util.element import ifcopenshell.util.representation from ifcopenshell.util.shape_builder import V -import blenderbim import blenderbim.tool as tool import blenderbim.core.geometry import blenderbim.core.geometry as core diff --git a/src/blenderbim/blenderbim/bim/module/model/railing.py b/src/blenderbim/blenderbim/bim/module/model/railing.py index 843db19ed2..e4559fd2d6 100644 --- a/src/blenderbim/blenderbim/bim/module/model/railing.py +++ b/src/blenderbim/blenderbim/bim/module/model/railing.py @@ -24,10 +24,9 @@ import ifcopenshell.api import ifcopenshell.util.representation import ifcopenshell.util.unit from ifcopenshell.util.shape_builder import V -import blenderbim import blenderbim.core.root +import blenderbim.core.geometry import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore from blenderbim.bim.module.model.door import bm_sort_out_geom from blenderbim.bim.module.model.data import RailingData, refresh from blenderbim.bim.module.model.decorator import ProfileDecorator diff --git a/src/blenderbim/blenderbim/bim/module/model/roof.py b/src/blenderbim/blenderbim/bim/module/model/roof.py index 92a7d2347e..02e4b18afe 100644 --- a/src/blenderbim/blenderbim/bim/module/model/roof.py +++ b/src/blenderbim/blenderbim/bim/module/model/roof.py @@ -23,7 +23,6 @@ import ifcopenshell import ifcopenshell.api import ifcopenshell.util.representation import ifcopenshell.util.unit -import blenderbim import blenderbim.core.root import blenderbim.tool as tool from blenderbim.bim.helper import convert_property_group_from_si diff --git a/src/blenderbim/blenderbim/bim/module/model/stair.py b/src/blenderbim/blenderbim/bim/module/model/stair.py index 4bfb01ea65..ac5947ccc4 100644 --- a/src/blenderbim/blenderbim/bim/module/model/stair.py +++ b/src/blenderbim/blenderbim/bim/module/model/stair.py @@ -23,7 +23,6 @@ import ifcopenshell import ifcopenshell.api import ifcopenshell.util.representation import ifcopenshell.util.unit -import blenderbim import blenderbim.core.root import blenderbim.tool as tool from mathutils import Vector diff --git a/src/blenderbim/blenderbim/bim/module/sequence/prop.py b/src/blenderbim/blenderbim/bim/module/sequence/prop.py index add76f452e..57c425ddb9 100644 --- a/src/blenderbim/blenderbim/bim/module/sequence/prop.py +++ b/src/blenderbim/blenderbim/bim/module/sequence/prop.py @@ -224,7 +224,7 @@ def updateTaskDuration(self, context): else: task_time = tool.Ifc.run("sequence.add_task_time", task=task) tool.Ifc.run("sequence.edit_task_time", task_time=task_time, attributes={"ScheduleDuration": duration}) - blenderbim.core.sequence.load_task_properties(tool.Sequence) + core.load_task_properties(tool.Sequence) tool.Sequence.refresh_task_resources() diff --git a/src/blenderbim/blenderbim/bim/module/void/operator.py b/src/blenderbim/blenderbim/bim/module/void/operator.py index 2f6e684f0f..d38f46f391 100644 --- a/src/blenderbim/blenderbim/bim/module/void/operator.py +++ b/src/blenderbim/blenderbim/bim/module/void/operator.py @@ -23,6 +23,7 @@ import ifcopenshell.util.representation import blenderbim.tool as tool import blenderbim.core.geometry import blenderbim.core.root +import blenderbim.bim.handler from blenderbim.bim.ifc import IfcStore from blenderbim.bim.module.model.opening import FilledOpeningGenerator