scripts-blender/addons/asset_pipeline_2/asset_mapping.py

@@ -1,7 +1,7 @@
 import bpy
 from typing import Dict, Set
 from . import core  # TODO DEBUG WHY THIS DOESN'T WORK
-from .asset_naming import get_target_name, get_basename, get_name_with_asset_prefix
+from .naming import get_target_name, get_basename, get_name_with_asset_prefix
 from .util import get_storage_of_id
 from .transfer_data.transfer_core import transfer_data_add_entry
 from .other_ids import get_other_ids

scripts-blender/addons/asset_pipeline_2/core.py

@@ -8,10 +8,11 @@ from .transfer_data.transfer_core import (
     transfer_data_clean,
 )
 
-from .asset_naming import (
+from .naming import (
     add_suffix_to_hierarchy,
     remove_suffix_from_hierarchy,
     get_name_with_asset_prefix,
+    get_task_layer_col_name,
 )
 
 
@@ -111,12 +112,6 @@ def get_invalid_objects(
     return invalid_obj
 
 
-def get_task_layer_col_name(task_layer_key):
-    # TODO Docstring and return types
-    task_layer_name = constants.TASK_LAYER_TYPES[task_layer_key]
-    return get_name_with_asset_prefix(task_layer_name)
-
-
 def remap_user(source_datablock: bpy.data, target_datablock: bpy.data) -> None:
     """Remap datablock and append name to datablock that has been remapped
 

scripts-blender/addons/asset_pipeline_2/naming.py

@@ -122,3 +122,9 @@ def get_name_with_asset_prefix(name: str):
         return name
     prefix = asset_pipe.prefix + "." if asset_pipe.prefix != "" else ""
     return prefix + name
+
+
+def get_task_layer_col_name(task_layer_key):
+    # TODO Docstring and return types
+    task_layer_name = constants.TASK_LAYER_TYPES[task_layer_key]
+    return get_name_with_asset_prefix(task_layer_name)

scripts-blender/addons/asset_pipeline_2/ops.py

@@ -7,9 +7,9 @@ from .publish import (
     find_all_published,
     get_next_published_file,
 )
+from naming import get_task_layer_col_name
 from .other_ids import init_other_ids
 from .core import (
-    get_task_layer_col_name,
     ownership_get,
     ownership_set,
     get_invalid_objects,

scripts-blender/addons/asset_pipeline_2/transfer_data/transfer_core.py

@@ -1,7 +1,7 @@
 import bpy
 from . import transfer_functions
 
-from .. import asset_naming, constants
+from .. import constants, naming
 
 
 def copy_transfer_data_ownership(
@@ -227,7 +227,7 @@ def transfer_info_clean(obj, list, td_type):
         obj.transfer_data_ownership, td_type
     )
     for item in list:
-        if not asset_naming.get_basename(item.name) in transfer_data_list:
+        if not naming.get_basename(item.name) in transfer_data_list:
             list.remove(item)
 
 

scripts-blender/addons/asset_pipeline_2/transfer_data/transfer_functions.py

@@ -1,6 +1,6 @@
 import bpy
 from bpy import context
-from ..asset_naming import get_basename
+from ..naming import get_basename
 from ..drivers import find_drivers, copy_driver
 from . import transfer_core  # TODO FIX
 from .. import constants