Make all "import as" imports relative

src/blenderbim/blenderbim/bim/export_ifc.py

@@ -29,7 +29,7 @@ import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.util.placement
 import ifcopenshell.util.unit
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.core.geometry
 import blenderbim.core.aggregate
 import blenderbim.core.spatial

src/blenderbim/blenderbim/bim/handler.py

@@ -24,7 +24,7 @@ import ifcopenshell.util.element
 import ifcopenshell.util.representation
 import ifcopenshell.api.owner.settings
 import blenderbim.bim
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.core.owner as core_owner
 from bpy.app.handlers import persistent
 from .ifc import IfcStore

src/blenderbim/blenderbim/bim/helper.py

@@ -26,7 +26,7 @@ import ifcopenshell.util.element
 from ifcopenshell.util.doc import get_attribute_doc, get_predefined_type_doc, get_property_doc
 from mathutils import geometry
 from mathutils import Vector
-import blenderbim.tool as tool
+from .. import tool
 from .ifc import IfcStore
 from typing import Optional, Callable, Any, Union
 

src/blenderbim/blenderbim/bim/ifc.py

@@ -29,7 +29,7 @@ import ifcopenshell
 import ifcopenshell.geom
 import ifcopenshell.ifcopenshell_wrapper
 import blenderbim.bim.handler
-import blenderbim.tool as tool
+from .. import tool
 from pathlib import Path
 from ..tool.brick import BrickStore
 from typing import Set, Union, Optional, TypedDict, Callable

src/blenderbim/blenderbim/bim/import_ifc.py

@@ -32,7 +32,7 @@ import ifcopenshell.util.geolocation
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import ifcopenshell.util.shape
-import blenderbim.tool as tool
+from .. import tool
 from itertools import chain, accumulate
 from .ifc import IfcStore, IFC_CONNECTED_TYPE
 from ..tool.loader import OBJECT_DATA_TYPE

src/blenderbim/blenderbim/bim/module/aggregate/data.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 import ifcopenshell.util.element
 
 

src/blenderbim/blenderbim/bim/module/aggregate/operator.py

@@ -19,7 +19,7 @@
 import bpy
 import ifcopenshell
 import ifcopenshell.util.element
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.aggregate as core
 import blenderbim.core.spatial
 import blenderbim.bim.handler

src/blenderbim/blenderbim/bim/module/aggregate/ui.py

@@ -20,7 +20,7 @@ from bpy.types import Panel
 from .data import AggregateData
 from ..group.data import GroupsData, ObjectGroupsData
 from ...ifc import IfcStore
-import blenderbim.tool as tool
+from .... import tool
 
 
 class BIM_PT_aggregate(Panel):

src/blenderbim/blenderbim/bim/module/attribute/data.py

@@ -18,7 +18,7 @@
 
 import bpy
 import ifcopenshell
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/attribute/operator.py

@@ -23,7 +23,7 @@ import ifcopenshell.api
 import ifcopenshell.guid
 import blenderbim.bim.helper
 import blenderbim.bim.handler
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.attribute as core
 from ...ifc import IfcStore
 

src/blenderbim/blenderbim/bim/module/boundary/data.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/boundary/decorator.py

@@ -18,7 +18,7 @@
 
 import gpu
 import bmesh
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import SpaceView3D
 from mathutils import Vector
 from gpu_extras.batch import batch_for_shader

src/blenderbim/blenderbim/bim/module/boundary/operator.py

@@ -31,8 +31,8 @@ import ifcopenshell.util.shape
 import ifcopenshell.util.element
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
-import blenderbim.tool as tool
-import blenderbim.bim.import_ifc as import_ifc
+from .... import tool
+from ... import import_ifc
 from math import pi, inf, degrees, acos, radians
 from mathutils import Vector, Matrix
 from ...ifc import IfcStore

src/blenderbim/blenderbim/bim/module/boundary/prop.py

@@ -29,7 +29,7 @@ from bpy.props import (
     FloatVectorProperty,
     CollectionProperty,
 )
-import blenderbim.tool as tool
+from .... import tool
 
 
 def space_filter(self, object):

src/blenderbim/blenderbim/bim/module/boundary/ui.py

@@ -20,7 +20,7 @@ import bpy
 import blenderbim.bim.helper
 from bpy.types import Panel, UIList
 from ...ifc import IfcStore
-import blenderbim.tool as tool
+from .... import tool
 from .data import SpaceBoundariesData
 
 

src/blenderbim/blenderbim/bim/module/brick/data.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 from ....tool.brick import BrickStore
 
 try:

src/blenderbim/blenderbim/bim/module/brick/operator.py

@@ -19,7 +19,7 @@
 import os
 import bpy
 import ifcopenshell.api
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.brick as core
 import blenderbim.bim.handler
 from ...ifc import IfcStore

src/blenderbim/blenderbim/bim/module/brick/ui.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import Panel, UIList
 from ...helper import prop_with_search
 from .data import BrickschemaData, BrickschemaReferencesData

src/blenderbim/blenderbim/bim/module/bsdd/operator.py

@@ -18,7 +18,7 @@
 
 import bpy
 import bsdd
-import blenderbim.tool as tool
+from .... import tool
 from ....core import bsdd as core
 
 

src/blenderbim/blenderbim/bim/module/bsdd/ui.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import Panel, UIList
 from ...ifc import IfcStore
 

src/blenderbim/blenderbim/bim/module/cad/operator.py

@@ -21,7 +21,7 @@ import math
 import bmesh
 import mathutils
 import bpy_extras
-import blenderbim.tool as tool
+from .... import tool
 from mathutils import Vector, Matrix
 from math import pi, radians, sin, cos, sqrt
 import ifcopenshell.util.unit

src/blenderbim/blenderbim/bim/module/cad/workspace.py

@@ -18,7 +18,7 @@
 
 import os
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.bim.module.type.prop as type_prop
 import ifcopenshell.util.unit
 from bpy.types import WorkSpaceTool

src/blenderbim/blenderbim/bim/module/clash/data.py

@@ -19,7 +19,7 @@
 import bpy
 import json
 import ifcopenshell.util.element
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/clash/decorator.py

@@ -19,7 +19,7 @@
 import blf
 import gpu
 import bmesh
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import SpaceView3D
 from mathutils import Vector
 from gpu_extras.batch import batch_for_shader

src/blenderbim/blenderbim/bim/module/clash/operator.py

@@ -23,7 +23,7 @@ import bmesh
 import logging
 import numpy as np
 import ifcopenshell
-import blenderbim.tool as tool
+from .... import tool
 from math import radians
 from mathutils import Matrix, Vector
 from ...ifc import IfcStore

src/blenderbim/blenderbim/bim/module/classification/data.py

@@ -20,7 +20,7 @@ import bpy
 import ifcopenshell
 import ifcopenshell.util.date
 import ifcopenshell.util.classification
-import blenderbim.tool as tool
+from .... import tool
 from ...ifc import IfcStore
 
 

src/blenderbim/blenderbim/bim/module/classification/operator.py

@@ -22,7 +22,7 @@ import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.util.classification
 import ifcopenshell.util.element
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.bim.helper
 from ...ifc import IfcStore
 

src/blenderbim/blenderbim/bim/module/classification/ui.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.bim.module.classification.prop as classification_prop
 from bpy.types import Panel, UIList
 from ...ifc import IfcStore

src/blenderbim/blenderbim/bim/module/constraint/data.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/constraint/operator.py

@@ -21,7 +21,7 @@ import json
 import ifcopenshell.api
 import ifcopenshell.util.attribute
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 from ...ifc import IfcStore
 
 

src/blenderbim/blenderbim/bim/module/constraint/prop.py

@@ -18,7 +18,7 @@
 
 import bpy
 from ifcopenshell.util.doc import get_entity_doc
-import blenderbim.tool as tool
+from .... import tool
 from ...prop import Attribute
 from bpy.types import PropertyGroup
 from bpy.props import (

src/blenderbim/blenderbim/bim/module/context/data.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/context/operator.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.context as core
 import blenderbim.bim.module.context.data
 import blenderbim.bim.handler

src/blenderbim/blenderbim/bim/module/context/ui.py

@@ -18,7 +18,7 @@
 
 import bpy
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 from .data import ContextData
 
 

src/blenderbim/blenderbim/bim/module/cost/data.py

@@ -22,7 +22,7 @@ import ifcopenshell.util.cost
 import ifcopenshell.util.date
 import ifcopenshell.util.element
 import ifcopenshell.util.unit
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.bim.schema
 from ifcopenshell.util.doc import get_entity_doc, get_predefined_type_doc
 from typing import Any

src/blenderbim/blenderbim/bim/module/cost/operator.py

@@ -22,9 +22,9 @@ import json
 import time
 import ifcopenshell.api
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 from bpy_extras.io_utils import ImportHelper
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.cost as core
 
 

src/blenderbim/blenderbim/bim/module/cost/prop.py

@@ -18,7 +18,7 @@
 
 import bpy
 import ifcopenshell.api
-import blenderbim.tool as tool
+from .... import tool
 from ...ifc import IfcStore
 from ..classification.data import CostClassificationsData
 from .data import CostSchedulesData, CostItemRatesData, CostItemQuantitiesData

src/blenderbim/blenderbim/bim/module/covering/workspace.py

@@ -20,7 +20,7 @@
 import os
 import bpy
 import ifcopenshell
-import blenderbim.tool as tool
+from .... import tool
 from ...helper import prop_with_search
 from ..model.data import AuthoringData
 from bpy.types import WorkSpaceTool

src/blenderbim/blenderbim/bim/module/csv/operator.py

@@ -24,8 +24,8 @@ import logging
 import tempfile
 import ifcopenshell
 import ifcopenshell.util.selector
-import blenderbim.tool as tool
-import blenderbim.bim.module.drawing.scheduler as scheduler
+from .... import tool
+from ..drawing import scheduler
 from ...ifc import IfcStore
 from ...handler import refresh_ui_data
 

src/blenderbim/blenderbim/bim/module/debug/operator.py

@@ -31,10 +31,10 @@ import ifcopenshell.geom
 import ifcopenshell.util.element
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.debug as core
 import blenderbim.bim.handler
-import blenderbim.bim.import_ifc as import_ifc
+from ... import import_ifc
 from pathlib import Path
 from ...ifc import IfcStore
 

src/blenderbim/blenderbim/bim/module/demo/data.py

@@ -29,7 +29,7 @@
 # of "fetching data" and "displaying data" is a common concept that makes UI
 # code much simpler, more efficient, and less error-prone to refresh data.
 
-import blenderbim.tool as tool
+from .... import tool
 
 
 # All data must have a refresh function. The refresh function simply sets all

src/blenderbim/blenderbim/bim/module/demo/operator.py

@@ -28,7 +28,7 @@
 # "Operators", since they correlate to a single user operation.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.demo as core
 import blenderbim.bim.handler
 

src/blenderbim/blenderbim/bim/module/diff/data.py

@@ -18,7 +18,7 @@
 
 import bpy
 import json
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/diff/operator.py

@@ -21,7 +21,7 @@ import json
 import logging
 import ifcopenshell
 import blenderbim.bim.handler
-import blenderbim.tool as tool
+from .... import tool
 from ...ifc import IfcStore
 
 

src/blenderbim/blenderbim/bim/module/diff/ui.py

@@ -20,7 +20,7 @@ from bpy.types import Panel
 from ...ifc import IfcStore
 from .data import DiffData
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 
 
 class BIM_PT_diff(Panel):

src/blenderbim/blenderbim/bim/module/document/data.py

@@ -20,7 +20,7 @@ import os
 import bpy
 import ifcopenshell
 import ifcopenshell.util.schema
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/document/operator.py

@@ -20,7 +20,7 @@ import bpy
 import json
 import ifcopenshell.api
 import ifcopenshell.util.attribute
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.document as core
 from ...ifc import IfcStore
 

src/blenderbim/blenderbim/bim/module/drawing/annotation.py

@@ -20,7 +20,7 @@ import os
 import bpy
 import math
 import bmesh
-import blenderbim.tool as tool
+from .... import tool
 import ifcopenshell.util.element
 from mathutils import Vector, Matrix
 

src/blenderbim/blenderbim/bim/module/drawing/data.py

@@ -21,7 +21,7 @@ import bpy
 import json
 import ifcopenshell.util.element
 import ifcopenshell.util.representation
-import blenderbim.tool as tool
+from .... import tool
 from pathlib import Path
 from typing import Any, Union
 

src/blenderbim/blenderbim/bim/module/drawing/decoration.py

@@ -25,8 +25,8 @@ import bmesh
 import shapely
 import ifcopenshell
 import ifcopenshell.util.element
-import blenderbim.tool as tool
-import blenderbim.bim.module.drawing.helper as helper
+from .... import tool
+from . import helper
 from math import pi, sin, cos, tan, acos, atan, degrees, radians, ceil
 from bpy.types import SpaceView3D
 from mathutils import Vector, Matrix

src/blenderbim/blenderbim/bim/module/drawing/handler.py

@@ -17,8 +17,8 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.bim.module.drawing.decoration as decoration
-import blenderbim.tool as tool
+from . import decoration
+from .... import tool
 from bpy.app.handlers import persistent
 
 

src/blenderbim/blenderbim/bim/module/drawing/helper.py

@@ -19,7 +19,7 @@
 import bpy
 import math
 import mathutils.geometry
-import blenderbim.tool as tool
+from .... import tool
 from mathutils import Vector
 
 # Code taken and updated from https://blenderartists.org/t/detecting-intersection-of-bounding-boxes/457520/2

src/blenderbim/blenderbim/bim/module/drawing/operator.py

@@ -38,14 +38,14 @@ import ifcopenshell.util.element
 import blenderbim.bim.schema
 import blenderbim.bim.helper
 import blenderbim.bim.handler
-import blenderbim.tool as tool
+from .... import 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
-import blenderbim.bim.module.drawing.sheeter as sheeter
-import blenderbim.bim.module.drawing.scheduler as scheduler
-import blenderbim.bim.module.drawing.helper as helper
+from . import svgwriter
+from . import annotation
+from . import sheeter
+from . import scheduler
+from . import helper
 import blenderbim.bim.export_ifc
 from .decoration import CutDecorator
 from .data import DecoratorData, DrawingsData

src/blenderbim/blenderbim/bim/module/drawing/prop.py

@@ -21,10 +21,10 @@ import bpy
 import json
 import enum
 import ifcopenshell
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.drawing as core
-import blenderbim.bim.module.drawing.annotation as annotation
-import blenderbim.bim.module.drawing.decoration as decoration
+from . import annotation
+from . import decoration
 from ...prop import BIMFilterGroup
 from .data import DrawingsData, DecoratorData, SheetsData, AnnotationData
 from .data import refresh as refresh_drawing_data

src/blenderbim/blenderbim/bim/module/drawing/sheeter.py

@@ -24,7 +24,7 @@ import ntpath
 import pystache
 import urllib.parse
 import xml.etree.ElementTree as ET
-import blenderbim.tool as tool
+from .... import tool
 import ifcopenshell.util.geolocation
 from xml.dom import minidom
 from mathutils import Vector

src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py

@@ -29,9 +29,9 @@ import ifcopenshell
 import ifcopenshell.util.element
 import ifcopenshell.util.representation
 import ifcopenshell.util.selector
-import blenderbim.tool as tool
-import blenderbim.bim.module.drawing.helper as helper
-import blenderbim.bim.module.drawing.annotation as annotation
+from .... import tool
+from . import helper
+from . import annotation
 from .data import DrawingsData
 
 from .data import DecoratorData

src/blenderbim/blenderbim/bim/module/drawing/ui.py

@@ -18,7 +18,7 @@
 
 import bpy
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import Panel
 from .data import (
     ProductAssignmentsData,

src/blenderbim/blenderbim/bim/module/drawing/workspace.py

@@ -20,7 +20,7 @@
 import os
 import bpy
 import blenderbim.core.type
-import blenderbim.tool as tool
+from .... import tool
 from ...helper import prop_with_search
 from bpy.types import WorkSpaceTool
 

src/blenderbim/blenderbim/bim/module/fm/operator.py

@@ -23,7 +23,7 @@ import ifcfm
 import logging
 import tempfile
 import ifcopenshell
-import blenderbim.tool as tool
+from .... import tool
 from ...operator import MultipleFileSelector
 
 

src/blenderbim/blenderbim/bim/module/fm/ui.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import Panel
 from ...ifc import IfcStore
 from .data import FMData

src/blenderbim/blenderbim/bim/module/geometry/data.py

@@ -18,7 +18,7 @@
 
 import bpy
 import ifcopenshell.util.element
-import blenderbim.tool as tool
+from .... import tool
 import ifcopenshell.util.placement
 from mathutils import Vector
 

src/blenderbim/blenderbim/bim/module/geometry/helper.py

@@ -21,7 +21,7 @@ import bmesh
 import mathutils
 import ifcopenshell
 import ifcopenshell.util.unit
-import blenderbim.tool as tool
+from .... import tool
 from math import pi, pow
 from mathutils import Vector, Matrix, geometry
 from typing import Union

src/blenderbim/blenderbim/bim/module/geometry/operator.py

@@ -34,7 +34,7 @@ import blenderbim.core.aggregate
 import blenderbim.core.style
 import blenderbim.core.root
 import blenderbim.core.drawing
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.bim.handler
 from mathutils import Vector, Matrix
 from time import time

src/blenderbim/blenderbim/bim/module/geometry/prop.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 from ...prop import StrProperty, Attribute
 from .data import RepresentationsData, ViewportData
 from bpy.types import PropertyGroup

src/blenderbim/blenderbim/bim/module/geometry/ui.py

@@ -18,7 +18,7 @@
 
 import bpy
 import blenderbim.bim
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import Panel, Menu, UIList
 from ...ifc import IfcStore
 from ...helper import prop_with_search

src/blenderbim/blenderbim/bim/module/georeference/data.py

@@ -19,7 +19,7 @@
 
 import bpy
 import numpy as np
-import blenderbim.tool as tool
+from .... import tool
 import ifcopenshell.util.geolocation
 from mathutils import Matrix
 from ifcopenshell.util.doc import get_entity_doc

src/blenderbim/blenderbim/bim/module/georeference/decorator.py

@@ -20,7 +20,7 @@ import blf
 import gpu
 import bmesh
 import ifcopenshell
-import blenderbim.tool as tool
+from .... import tool
 from math import radians
 from bpy.types import SpaceView3D
 from mathutils import Vector, Matrix

src/blenderbim/blenderbim/bim/module/georeference/operator.py

@@ -18,7 +18,7 @@
 
 import bpy
 
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.georeference as core
 from .decorator import GeoreferenceDecorator
 

src/blenderbim/blenderbim/bim/module/georeference/ui.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import Panel
 from ...helper import draw_attributes, draw_attribute
 from .data import GeoreferenceData

src/blenderbim/blenderbim/bim/module/group/data.py

@@ -20,7 +20,7 @@ import bpy
 import ifcopenshell
 import ifcopenshell.util.cost
 import ifcopenshell.util.element
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/group/operator.py

@@ -20,7 +20,7 @@ import bpy
 import ifcopenshell.util.attribute
 import ifcopenshell.api
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 from ...ifc import IfcStore
 import json
 

src/blenderbim/blenderbim/bim/module/ifcgit/data.py

@@ -3,7 +3,7 @@ import os
 import shutil
 
 # import tool
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/ifcgit/operator.py

@@ -2,7 +2,7 @@ import os
 import re
 import bpy
 import blenderbim.core.ifcgit as core
-import blenderbim.tool as tool
+from .... import tool
 from .data import IfcGitData, refresh
 
 

src/blenderbim/blenderbim/bim/module/layer/data.py

@@ -18,7 +18,7 @@
 
 import bpy
 import ifcopenshell
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/layer/operator.py

@@ -22,7 +22,7 @@ import ifcopenshell.api
 import ifcopenshell.util.element
 import ifcopenshell.util.attribute
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 from ...ifc import IfcStore
 
 

src/blenderbim/blenderbim/bim/module/library/data.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 
 
 def refresh():

src/blenderbim/blenderbim/bim/module/library/operator.py

@@ -18,7 +18,7 @@
 
 import bpy
 import ifcopenshell.api
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.library as core
 import blenderbim.bim.handler
 from ...ifc import IfcStore

src/blenderbim/blenderbim/bim/module/library/ui.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import Panel, UIList
 from .data import LibrariesData, LibraryReferencesData
 

src/blenderbim/blenderbim/bim/module/light/data.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 import ifcopenshell.util.geolocation
 from mathutils import Vector
 

src/blenderbim/blenderbim/bim/module/light/decorator.py

@@ -20,7 +20,7 @@ import bpy
 import blf
 import gpu
 import bmesh
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import SpaceView3D
 from math import radians
 from mathutils import Vector, Matrix

src/blenderbim/blenderbim/bim/module/light/operator.py

@@ -24,7 +24,7 @@ import multiprocessing
 import pyradiance as pr
 import ifcopenshell
 import ifcopenshell.geom
-import blenderbim.tool as tool
+from .... import tool
 from pathlib import Path
 from typing import Union
 from .data import SolarData

src/blenderbim/blenderbim/bim/module/light/prop.py

@@ -20,7 +20,7 @@ import bpy
 import pytz
 import tzfpy
 import datetime
-import blenderbim.tool as tool
+from .... import tool
 from math import radians, pi
 from mathutils import Euler, Vector, Matrix, Quaternion
 from bpy.props import IntProperty, StringProperty, EnumProperty, FloatProperty, FloatVectorProperty, BoolProperty

src/blenderbim/blenderbim/bim/module/light/ui.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 from .data import SolarData
 
 

src/blenderbim/blenderbim/bim/module/material/data.py

@@ -22,7 +22,7 @@ import ifcopenshell
 import ifcopenshell.util.element
 import ifcopenshell.util.doc
 import ifcopenshell.util.schema
-import blenderbim.tool as tool
+from .... import tool
 from ..drawing.helper import format_distance
 
 

src/blenderbim/blenderbim/bim/module/material/operator.py

@@ -23,7 +23,7 @@ import ifcopenshell.util.element
 import ifcopenshell.util.attribute
 import ifcopenshell.util.representation
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.style
 import blenderbim.core.material as core
 import blenderbim.bim.module.model.profile as model_profile

src/blenderbim/blenderbim/bim/module/material/prop.py

@@ -18,7 +18,7 @@
 
 import bpy
 from ifcopenshell.util.doc import get_entity_doc
-import blenderbim.tool as tool
+from .... import tool
 from .data import MaterialsData, ObjectMaterialData
 from ...ifc import IfcStore
 from ...prop import StrProperty, Attribute

src/blenderbim/blenderbim/bim/module/material/ui.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .... import tool
 import bpy
 from bpy.types import Panel, UIList
 from ...ifc import IfcStore

src/blenderbim/blenderbim/bim/module/misc/operator.py

@@ -20,7 +20,7 @@ import bpy
 import numpy as np
 import ifcopenshell
 import blenderbim.bim.handler
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.misc as core
 import blenderbim.core.geometry as core_geometry
 import blenderbim.core.root

src/blenderbim/blenderbim/bim/module/model/array.py

@@ -21,7 +21,7 @@ import json
 import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.util.element
-import blenderbim.tool as tool
+from .... import tool
 from mathutils import Vector, Matrix
 
 

src/blenderbim/blenderbim/bim/module/model/covering.py

@@ -19,7 +19,7 @@
 
 import bpy
 import ifcopenshell
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.covering as core
 
 

src/blenderbim/blenderbim/bim/module/model/data.py

@@ -22,7 +22,7 @@ import json
 import ifcopenshell
 import ifcopenshell.util.element
 from ifcopenshell.util.doc import get_entity_doc, get_predefined_type_doc
-import blenderbim.tool as tool
+from .... import tool
 from math import degrees
 
 

src/blenderbim/blenderbim/bim/module/model/decorator.py

@@ -18,7 +18,7 @@
 
 import gpu
 import bmesh
-import blenderbim.tool as tool
+from .... import tool
 from math import sin, cos, radians
 from bpy.types import SpaceView3D
 from mathutils import Vector, Matrix

src/blenderbim/blenderbim/bim/module/model/door.py

@@ -26,7 +26,7 @@ import ifcopenshell.api
 import ifcopenshell.util.element
 import ifcopenshell.util.representation
 from ifcopenshell.util.shape_builder import V
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.geometry
 import blenderbim.core.geometry as core
 import blenderbim.core.root

src/blenderbim/blenderbim/bim/module/model/grid.py

@@ -18,7 +18,7 @@
 
 import bpy
 import ifcopenshell.api
-import blenderbim.tool as tool
+from .... import tool
 from bpy.types import Operator
 from bpy.props import FloatProperty, IntProperty
 from mathutils import Vector

src/blenderbim/blenderbim/bim/module/model/mep.py

@@ -34,7 +34,7 @@ import blenderbim.bim.handler
 import blenderbim.core.type
 import blenderbim.core.root
 import blenderbim.core.geometry
-import blenderbim.tool as tool
+from .... import tool
 from math import pi, degrees, radians, sin, cos, asin, tan
 from copy import copy
 from mathutils import Vector, Matrix

src/blenderbim/blenderbim/bim/module/model/opening.py

@@ -32,9 +32,9 @@ import ifcopenshell.util.shape_builder
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import ifcopenshell.util.unit
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.geometry
-import blenderbim.bim.import_ifc as import_ifc
+from ... import import_ifc
 import blenderbim.bim.handler
 from ...ifc import IfcStore
 from math import pi, radians

src/blenderbim/blenderbim/bim/module/model/pie.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.spatial
 import blenderbim.core.aggregate
 from ...ifc import IfcStore

src/blenderbim/blenderbim/bim/module/model/product.py

@@ -28,7 +28,7 @@ import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import ifcopenshell.util.type
 import ifcopenshell.util.unit
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.aggregate
 import blenderbim.core.type
 import blenderbim.core.geometry

src/blenderbim/blenderbim/bim/module/model/profile.py

@@ -28,7 +28,7 @@ import ifcopenshell.util.element
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import blenderbim.bim.handler
-import blenderbim.tool as tool
+from .... import tool
 import blenderbim.core.type
 import blenderbim.core.geometry
 import blenderbim.core.material

src/blenderbim/blenderbim/bim/module/model/prop.py

@@ -18,7 +18,7 @@
 
 import bpy
 import ifcopenshell
-import blenderbim.tool as tool
+from .... import tool
 import math
 from ...prop import ObjProperty
 from .data import AuthoringData