Refactored blanket imports of global util modules

Blanket importing the global util modules may cause unintended name collisions when a matching module is present in the subpackage in question.
To mitigate this, blanket imports were replaced by imports of specific members only.

Author: MrClock8163

Arma3ObjectBuilder/io_armature/__init__.py

@@ -2,7 +2,7 @@
 import bpy_extras
 
 from . import importer
-from .. import utils
+from ..utils import op_report, is_valid_idx
 
 
 class A3OB_OT_import_armature(bpy.types.Operator, bpy_extras.io_utils.ImportHelper):
@@ -37,13 +37,13 @@ def draw(self, context):
 
     def execute(self, context):
         scene_props = context.scene.a3ob_rigging
-        if not utils.is_valid_idx(self.skeleton_index, scene_props.skeletons):
-            utils.op_report(self, {'ERROR'}, "No skeleton was selected")
+        if not is_valid_idx(self.skeleton_index, scene_props.skeletons):
+            op_report(self, {'ERROR'}, "No skeleton was selected")
             return {'FINISHED'}
 
         skeleton = scene_props.skeletons[self.skeleton_index]
         if not importer.is_valid_skeleton(skeleton):
-            utils.op_report(self, {'ERROR'}, "Invalid skeleton definiton, run skeleton validation for RTM for more info")
+            op_report(self, {'ERROR'}, "Invalid skeleton definiton, run skeleton validation for RTM for more info")
             return {'FINISHED'}
 
         importer.import_armature(self, skeleton)

Arma3ObjectBuilder/io_asc/__init__.py

@@ -2,11 +2,11 @@
 import bpy_extras
 
 from . import props, importer, exporter
-from .. import utils
-from .. import utils_io
+from ..utils import op_report, PanelHeaderLinkMixin
+from ..utils_io import ExportFileHandler
 
 
-class A3OB_PT_object_dtm(bpy.types.Panel, utils.PanelHeaderLinkMixin):
+class A3OB_PT_object_dtm(bpy.types.Panel, PanelHeaderLinkMixin):
     bl_region_type = 'WINDOW'
     bl_space_type = 'PROPERTIES'
     bl_label = "Object Builder: DTM Properties"
@@ -75,7 +75,7 @@ def draw(self, context):
     def execute(self, context):        
         with open(self.filepath) as file:
             importer.read_file(self, context, file)
-            utils.op_report(self, {'INFO'}, "Successfully imported DTM")
+            op_report(self, {'INFO'}, "Successfully imported DTM")
 
         return {'FINISHED'}
 
@@ -153,9 +153,9 @@ def draw(self, context):
     def execute(self, context):        
         obj = context.active_object
 
-        with utils_io.ExportFileHandler(self.filepath, "wt") as file:
+        with ExportFileHandler(self.filepath, "wt") as file:
             exporter.write_file(self, context, file, obj)
-            utils.op_report(self, {'INFO'}, "Successfuly exported DTM")
+            op_report(self, {'INFO'}, "Successfuly exported DTM")
 
         return {'FINISHED'}
 

Arma3ObjectBuilder/io_mcfg/__init__.py

@@ -3,8 +3,8 @@
 
 from . import importer, exporter
 from .validator import SkeletonValidator
-from .. import utils
-from .. import utils_io
+from ..utils import op_report
+from ..utils_io import ExportFileHandler
 from ..logger import ProcessLoggerNull
 
 
@@ -42,10 +42,10 @@ def execute(self, context):
         count_skeletons = importer.read_file(self, context)
 
         if count_skeletons > 0:
-            utils.op_report(self, {'INFO'}, "Successfully imported %d skeleton(s)" % count_skeletons)
+            op_report(self, {'INFO'}, "Successfully imported %d skeleton(s)" % count_skeletons)
             return {'FINISHED'}
 
-        utils.op_report(self, {'ERROR'}, "Could not import any skeletons (check the system console)")
+        op_report(self, {'ERROR'}, "Could not import any skeletons (check the system console)")
 
         return {'FINISHED'}
 
@@ -109,12 +109,12 @@ def execute(self, context):
 
         validator = SkeletonValidator(ProcessLoggerNull())
         if not validator.validate(skeleton, False, True):
-            utils.op_report(self, {'ERROR'}, "Invalid skeleton definiton, run skeleton validation for more info")
+            op_report(self, {'ERROR'}, "Invalid skeleton definiton, run skeleton validation for more info")
             return {'FINISHED'}
 
-        with utils_io.ExportFileHandler(self.filepath, "w") as file:
+        with ExportFileHandler(self.filepath, "w") as file:
             exporter.write_file(self, skeleton, file)
-            utils.op_report(self, {'INFO'}, "Successfuly exported %s" % skeleton.name)
+            op_report(self, {'INFO'}, "Successfuly exported %s" % skeleton.name)
 
         return {'FINISHED'}
 

Arma3ObjectBuilder/io_p3d/__init__.py

@@ -6,8 +6,8 @@
 from . import ui_object, ui_mat
 from . import importer, exporter
 from .. import get_prefs
-from .. import utils
-from .. import utils_io
+from ..utils import op_report
+from ..utils_io import ExportFileHandler
 
 
 class A3OB_OT_import_p3d(bpy.types.Operator, bpy_extras.io_utils.ImportHelper):
@@ -103,7 +103,7 @@ def draw(self, context):
     def execute(self, context):        
         with open(self.filepath, "rb") as file:
             lod_objects = importer.read_file(self, context, file)
-            utils.op_report(self, {'INFO'}, "Successfully imported %d LODs (check the logs in the system console)" % len(lod_objects))
+            op_report(self, {'INFO'}, "Successfully imported %d LODs (check the logs in the system console)" % len(lod_objects))
 
         return {'FINISHED'}
 
@@ -323,20 +323,20 @@ def draw(self, context):
 
     def execute(self, context):        
         if not exporter.can_export(self, context):
-            utils.op_report(self, {'ERROR'}, "There are no LODs to export")
+            op_report(self, {'ERROR'}, "There are no LODs to export")
             return {'FINISHED'}
 
         temp_collection = exporter.create_temp_collection(context)
 
-        with utils_io.ExportFileHandler(self.filepath, "wb") as file:
+        with ExportFileHandler(self.filepath, "wb") as file:
             # The export needs to be put inside a try-catch block in order to do the temporary object cleanup.
             try:
                 lod_count, exported_count = exporter.write_file(self, context, file, temp_collection)
 
                 if lod_count == exported_count:
-                    utils.op_report(self, {'INFO'}, "Successfully exported all %d LODs (check the logs in the system console)" % exported_count)
+                    op_report(self, {'INFO'}, "Successfully exported all %d LODs (check the logs in the system console)" % exported_count)
                 else:
-                    utils.op_report(self, {'WARNING'}, "Only exported %d/%d LODs (check the logs in the system console)" % (exported_count, lod_count))
+                    op_report(self, {'WARNING'}, "Only exported %d/%d LODs (check the logs in the system console)" % (exported_count, lod_count))
 
             finally:
                 if not get_prefs().preserve_preprocessed_lods:

Arma3ObjectBuilder/io_p3d/exporter.py

@@ -15,8 +15,8 @@
 from . import flags as p3d_flags
 from .validator import LODValidator
 from .. import get_prefs
-from .. import utils
-from .. import utils_compat as computils
+from ..utils import edit_bmesh
+from ..utils_compat import call_operator_ctx, mesh_auto_smooth, mesh_static_normals_iterator
 from ..logger import ProcessLogger, ProcessLoggerNull
 
 
@@ -83,7 +83,7 @@ def apply_modifiers(obj):
         m = modifiers.pop(0)
         try:
             ctx["modifier"] = m
-            computils.call_operator_ctx(bpy.ops.object.modifier_apply, ctx, modifier= m.name)
+            call_operator_ctx(bpy.ops.object.modifier_apply, ctx, modifier= m.name)
         except:
             obj.modifiers.remove(m)
 
@@ -95,13 +95,13 @@ def apply_transforms(obj):
         "selected_editable_objects": [obj],
         "edit_object": None
     }
-    computils.call_operator_ctx(bpy.ops.object.transform_apply, ctx)
+    call_operator_ctx(bpy.ops.object.transform_apply, ctx)
 
 
 # In order to simplify merging the LOD parts, and the data access later on, the dereferenced
 # flags need to be written directly into their respective integer bmesh layers.
 def bake_flags_vertex(obj):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
 
         layer = p3d_flags.get_layer_flags_vertex(bm)
@@ -117,7 +117,7 @@ def bake_flags_vertex(obj):
 
 
 def bake_flags_face(obj):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.faces.ensure_lookup_table()
 
         layer = p3d_flags.get_layer_flags_face(bm)
@@ -133,7 +133,7 @@ def bake_flags_face(obj):
 
 
 def blank_flags_vertex(obj):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
         layer = p3d_flags.get_layer_flags_vertex(bm)
 
@@ -142,7 +142,7 @@ def blank_flags_vertex(obj):
 
 
 def blank_flags_face(obj):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.faces.ensure_lookup_table()
         layer = p3d_flags.get_layer_flags_face(bm)
 
@@ -172,7 +172,7 @@ def merge_sub_objects(operator, main_obj, sub_objects):
             "selected_objects": all_objects,
             "selected_editable_objects": all_objects
         }
-        computils.call_operator_ctx(bpy.ops.object.join, ctx)
+        call_operator_ctx(bpy.ops.object.join, ctx)
 
 
 def merge_proxy_objects(main_obj, proxy_objects, relative):
@@ -201,7 +201,7 @@ def merge_proxy_objects(main_obj, proxy_objects, relative):
             "selected_objects": all_objects,
             "selected_editable_objects": all_objects
         }
-        computils.call_operator_ctx(bpy.ops.object.join, ctx)
+        call_operator_ctx(bpy.ops.object.join, ctx)
 
     return proxy_lookup
 
@@ -239,7 +239,7 @@ def get_sub_objects(obj, temp_collection):
             continue
 
         if not child.mode == 'OBJECT':
-            computils.call_operator_ctx(bpy.ops.object.mode_set, {"active_object": child}, mode='OBJECT')
+            call_operator_ctx(bpy.ops.object.mode_set, {"active_object": child}, mode='OBJECT')
 
         child_copy = duplicate_object(child, temp_collection)
 
@@ -256,7 +256,7 @@ def sort_sections(obj):
     for i in range(len(obj.material_slots)):
         sections[i] = []
 
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.faces.ensure_lookup_table()
 
         for face in bm.faces:
@@ -282,8 +282,8 @@ def cleanup_normals(operator, obj):
             "active_object": obj,
             "object": obj
         }
-        computils.call_operator_ctx(bpy.ops.mesh.customdata_custom_splitnormals_clear, ctx)
-        computils.mesh_auto_smooth(obj.data)
+        call_operator_ctx(bpy.ops.mesh.customdata_custom_splitnormals_clear, ctx)
+        mesh_auto_smooth(obj.data)
         mod = obj.modifiers.new("Temp", 'WEIGHTED_NORMAL')
         mod.weight = 50
         mod.keep_sharp = True
@@ -337,7 +337,7 @@ def get_lod_data(operator, context, validator, temp_collection):
 
         # Some operator polls fail later if an object is in edit mode.
         if not obj.mode == 'OBJECT':
-            computils.call_operator_ctx(bpy.ops.object.mode_set, {"active_object": obj}, mode='OBJECT')
+            call_operator_ctx(bpy.ops.object.mode_set, {"active_object": obj}, mode='OBJECT')
 
         main_obj = duplicate_object(obj, temp_collection)
         is_valid = True
@@ -410,7 +410,7 @@ def process_normals(mesh):
     normals_index = {}
     normals_lookup_dict = {}
 
-    for i, normal in computils.mesh_static_normals_iterator(mesh):
+    for i, normal in mesh_static_normals_iterator(mesh):
         if normal not in normals_index:
             normals_index[normal] = len(normals_index)
             output.append(normal)

Arma3ObjectBuilder/io_p3d/flags.py

@@ -1,7 +1,7 @@
 # Helper functions to handle vertex and face flag values.
 
 
-from .. import utils
+from ..utils import edit_bmesh
 
 
 flags_vertex_surface = {
@@ -180,7 +180,7 @@ def set_flag_face(props, value):
 
 
 def remove_group_vertex(obj, group_id):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
         layer = get_layer_flags_vertex(bm)
         for vertex in bm.verts:
@@ -189,7 +189,7 @@ def remove_group_vertex(obj, group_id):
 
 
 def assign_group_vertex(obj, group_id):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
 
         layer = get_layer_flags_vertex(bm)
@@ -201,7 +201,7 @@ def assign_group_vertex(obj, group_id):
 
 def select_group_vertex(obj, group_id, select = True):
     group_count = len(obj.a3ob_properties_object_flags.vertex)
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
 
         layer = get_layer_flags_vertex(bm)
@@ -212,7 +212,7 @@ def select_group_vertex(obj, group_id, select = True):
 
 
 def clear_groups_vertex(obj):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         flag_props = obj.a3ob_properties_object_flags
         flag_props.vertex.clear()
         flag_props.vertex_index = -1
@@ -221,7 +221,7 @@ def clear_groups_vertex(obj):
 
 
 def remove_group_face(obj, group_id):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
         layer = get_layer_flags_vertex(bm)
         for vertex in bm.verts:
@@ -230,7 +230,7 @@ def remove_group_face(obj, group_id):
 
 
 def assign_group_face(obj, group_id):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.faces.ensure_lookup_table()
 
         layer = get_layer_flags_face(bm)
@@ -242,7 +242,7 @@ def assign_group_face(obj, group_id):
 
 def select_group_face(obj, group_id, select = True):
     group_count = len(obj.a3ob_properties_object_flags.face)
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         bm.faces.ensure_lookup_table()
 
         layer = get_layer_flags_face(bm)
@@ -253,7 +253,7 @@ def select_group_face(obj, group_id, select = True):
 
 
 def clear_groups_face(obj):
-    with utils.edit_bmesh(obj) as bm:
+    with edit_bmesh(obj) as bm:
         flag_props = obj.a3ob_properties_object_flags
         flag_props.face.clear()
         flag_props.face_index = -1

Arma3ObjectBuilder/io_p3d/importer.py

@@ -13,8 +13,8 @@
 from . import data as p3d
 from . import flags as p3d_flags
 from . import utils as p3d_utils
-from .. import utils_io
-from .. import utils_compat as computils
+from ..utils_io import restore_absolute
+from ..utils_compat import call_operator_ctx, mesh_auto_smooth
 from ..logger import ProcessLogger
 
 
@@ -222,7 +222,7 @@ def process_proxies(operator, obj, proxy_lookup, empty_material):
             continue
 
         obj.vertex_groups.active = vgroup
-        computils.call_operator_ctx(bpy.ops.object.vertex_group_select)
+        call_operator_ctx(bpy.ops.object.vertex_group_select)
 
         try:
             bpy.ops.mesh.separate(type='SELECTED')
@@ -253,7 +253,7 @@ def process_proxies(operator, obj, proxy_lookup, empty_material):
 
             path, index = proxy_lookup[vgroup.name]
             proxy_obj.vertex_groups.remove(vgroup)
-            proxy_obj.a3ob_properties_object_proxy.proxy_path = utils_io.restore_absolute(path, ".p3d") if operator.absolute_paths else path
+            proxy_obj.a3ob_properties_object_proxy.proxy_path = restore_absolute(path, ".p3d") if operator.absolute_paths else path
             proxy_obj.a3ob_properties_object_proxy.proxy_index = index
 
             proxy_obj.a3ob_properties_object_flags.vertex.clear()
@@ -323,7 +323,7 @@ def process_lod(operator, logger, lod, materials, materials_lookup, categories,
         for face in mesh.polygons:
             face.use_smooth = True
 
-        computils.mesh_auto_smooth(mesh)
+        mesh_auto_smooth(mesh)
 
     if 'NORMALS' in operator.additional_data and lod_index in p3d.P3D_LOD_Resolution.LODS_VISUAL:
         if process_normals(mesh, lod):