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

@@ -211,6 +211,7 @@ class AssetTransferMapping:
             id_storage = get_storage_of_id(local_id)
             external_id = id_storage.get(external_id_name)
             # TODO Check for conflicts
+            self._check_id_conflict(external_id, local_id)
             if (
                 local_id.asset_id_owner in self._local_tls
                 and local_id.asset_id_owner != "NONE"

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

@@ -13,6 +13,7 @@ from .naming import (
     remove_suffix_from_hierarchy,
     get_name_with_asset_prefix,
     get_task_layer_col_name,
+    get_id_type_name,
 )
 
 
@@ -179,10 +180,13 @@ def merge_task_layer(
             error_msg += f"Transfer Data conflict found for '{conflict.name}' on obj '{conflict.id_data.name}'\n"
         return error_msg
 
-    if len(map.conflict_objects) != 0:
+    if len(map.conflict_ids) != 0:
         error_msg = ''
-        for conflict_obj in map.conflict_objects:
-            error_msg += f"Ownership conflict found for '{conflict_obj.name}'\n"
+        for conflict_obj in map.conflict_ids:
+            type_name = get_id_type_name(type(conflict_obj))
+            error_msg += (
+                f"Ownership conflict found for {type_name}: '{conflict_obj.name}'\n"
+            )
         return error_msg
 
     # Remove all transfer data from target objects