studio/blender-studio-tools
13
32
Fork 19
Code Issues 22 Pull Requests 4 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 +8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83b95ad611 - Show all commits

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

@ -177,6 +177,14 @@ class AssetTransferMapping:
if check_transfer_data_item.owner != transfer_data_item.owner and not ( if check_transfer_data_item.owner != transfer_data_item.owner and not (
check_transfer_data_item.surrender or transfer_data_item.surrender check_transfer_data_item.surrender or transfer_data_item.surrender
): ):
# In the case where we have a modifier where I changed my local task layer
# this should not return as a conflict
# Do this only if both task layers are local to the current file
if (
check_transfer_data_item.owner in self._local_tls
and transfer_data_item.owner in self._local_tls
):
return
self.conflict_transfer_data.append(transfer_data_item) self.conflict_transfer_data.append(transfer_data_item)
print("CONFLICT FOUND") print("CONFLICT FOUND")
return True return True