scripts-blender/addons/asset_pipeline_2/merge/asset_mapping.py

@@ -5,7 +5,7 @@ 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
-from . import constants
+from .. import constants
 
 
 class AssetTransferMapping:

scripts-blender/addons/asset_pipeline_2/merge/core.py

@@ -18,7 +18,7 @@ from .naming import (
 
 from pathlib import Path
 from typing import Dict
-from . import constants
+from .. import constants
 
 
 def ownership_transfer_data_cleanup(

scripts-blender/addons/asset_pipeline_2/merge/naming.py

@@ -21,7 +21,7 @@
 import bpy
 from bpy_extras.id_map_utils import get_id_reference_map, get_all_referenced_ids
 from .util import get_storage_of_id
-from . import constants
+from .. import constants
 
 DELIMITER = "."
 

scripts-blender/addons/asset_pipeline_2/merge/publish.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from . import constants
+from .. import constants
 
 
 def find_file_version(published_file: Path) -> int:

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

@@ -1,7 +1,9 @@
 import bpy
+
+from .. import naming
 from . import transfer_functions
 
-from .. import constants, naming
+from ... import constants
 
 
 def copy_transfer_data_ownership(

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

@@ -3,7 +3,7 @@ from bpy import context
 from ..naming import get_basename
 from ..drivers import find_drivers, copy_driver
 from . import transfer_core  # TODO FIX
-from .. import constants
+from ... import constants
 import mathutils
 import bmesh
 import numpy as np

scripts-blender/addons/asset_pipeline_2/merge/transfer_data/transfer_ui.py

@@ -1,5 +1,5 @@
 import bpy
-from .. import constants
+from ... import constants
 
 
 def draw_transfer_data_type(

scripts-blender/addons/asset_pipeline_2/ops.py

@@ -2,20 +2,20 @@ import bpy
 
 import os
 from pathlib import Path
-from .publish import (
+from .merge.publish import (
     find_sync_target,
     find_all_published,
     get_next_published_file,
 )
-from naming import get_task_layer_col_name
+from .merge.naming import get_task_layer_col_name
-from .other_ids import init_other_ids
+from .merge.other_ids import init_other_ids
-from .core import (
+from .merge.core import (
     ownership_get,
     ownership_set,
     get_invalid_objects,
     merge_task_layer,
 )
-from .transfer_data.transfer_ui import draw_transfer_data
+from .merge.transfer_data.transfer_ui import draw_transfer_data
 from . import constants
 
 

scripts-blender/addons/asset_pipeline_2/ui.py

@@ -1,7 +1,7 @@
 import bpy
 
 from pathlib import Path
-from .transfer_data.transfer_ui import draw_transfer_data
+from .merge.transfer_data.transfer_ui import draw_transfer_data
 from . import constants