studio/blender-studio-tools
13
30
Fork 19
Code Issues 20 Pull Requests 3 Projects Releases 1 Activity

Asset Pipeline v2 #145

Closed
Nick Alberelli wants to merge 431 commits from (deleted):feature/asset-pipeline-v2 into main
pull from: (deleted):feature/asset-pipeline-v2
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 26 Commits 431 Files Changed 70 +5 -7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1381a735e4 - Show all commits

12
scripts-blender/addons/asset_pipeline_2/merge/asset_mapping.py
View File

@ -38,7 +38,7 @@ class AssetTransferMapping:
self._no_match_source_colls: Set[bpy.types.Object] = set() self._no_match_source_colls: Set[bpy.types.Object] = set()
self._no_match_target_colls: Set[bpy.types.Object] = set() self._no_match_target_colls: Set[bpy.types.Object] = set()
self.conflict_objects = [] self.conflict_ids = []
self.conflict_trasnfer_data = [] self.conflict_trasnfer_data = []
self.generate_mapping() self.generate_mapping()
@ -60,9 +60,9 @@ class AssetTransferMapping:
return return
return external_obj return external_obj
def _check_obj_conflict(self, external_obj, local_obj): def _check_id_conflict(self, external_id, local_id):
if external_obj.asset_id_owner != local_obj.asset_id_owner: if external_id.asset_id_owner != local_id.asset_id_owner:
self.conflict_objects.append(local_obj) self.conflict_ids.append(local_id)
def _gen_object_map(self) -> Dict[bpy.types.Object, bpy.types.Object]: def _gen_object_map(self) -> Dict[bpy.types.Object, bpy.types.Object]:
""" """
@ -77,14 +77,12 @@ class AssetTransferMapping:
external_obj = self._get_external_object(local_obj) external_obj = self._get_external_object(local_obj)
if not external_obj: if not external_obj:
continue continue
self._check_id_conflict(external_obj, local_obj)
# IF ITEM IS OWNED BY LOCAL TASK LAYERS # IF ITEM IS OWNED BY LOCAL TASK LAYERS
if local_obj.asset_id_owner in self._local_tls: if local_obj.asset_id_owner in self._local_tls:
self._check_obj_conflict(external_obj, local_obj)
object_map[external_obj] = local_obj object_map[external_obj] = local_obj
# IF ITEM IS NOT OWNED BY LOCAL TASK LAYERS # IF ITEM IS NOT OWNED BY LOCAL TASK LAYERS
else: else:
self._check_obj_conflict(external_obj, local_obj)
object_map[local_obj] = external_obj object_map[local_obj] = external_obj
# Find new objects to add to local_col # Find new objects to add to local_col