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

@@ -47,7 +47,7 @@ class AssetTransferMapping:
         self.object_map = self._gen_object_map()
         self.collection_map = self._gen_collection_map()
         self.transfer_data_map = self._gen_transfer_data_map()
-        self.other_id_map = self._gen_other_id_map()
+        self.shared_id_map = self._gen_shared_id_map()
 
     def _get_external_object(self, local_obj):
         external_obj_name = get_target_name(
@@ -204,8 +204,8 @@ class AssetTransferMapping:
                                 transfer_data_map[name] = map_item
         return transfer_data_map
 
-    def _gen_other_id_map(self):
-        other_id_map: Dict[bpy.types.ID, bpy.types.ID] = {}
+    def _gen_shared_id_map(self):
+        shared_id_map: Dict[bpy.types.ID, bpy.types.ID] = {}
         for local_id in get_shared_ids(self._local_col):
             external_id_name = get_target_name(local_id.name)
             id_storage = get_storage_of_id(local_id)
@@ -216,9 +216,9 @@ class AssetTransferMapping:
                 and local_id.asset_id_owner != "NONE"
             ):
                 if external_id:
-                    other_id_map[external_id] = local_id
+                    shared_id_map[external_id] = local_id
             else:
                 if external_id:
-                    other_id_map[local_id] = external_id
+                    shared_id_map[local_id] = external_id
 
-        return other_id_map
+        return shared_id_map

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

@@ -200,8 +200,8 @@ def merge_task_layer(
     for col in map.collection_map:
         remap_user(col, map.collection_map[col])
 
-    for id in map.other_id_map:
-        remap_user(id, map.other_id_map[id])
+    for id in map.shared_id_map:
+        remap_user(id, map.shared_id_map[id])
 
     bpy.ops.outliner.orphans_purge(
         do_local_ids=True, do_linked_ids=False, do_recursive=True