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 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 275fa99821 - Show all commits

2
scripts-blender/addons/asset_pipeline_2/merge/transfer_data/transfer_functions.py
View File

@ -676,7 +676,7 @@ def parent_clean(obj):
matches = check_transfer_data_entry( matches = check_transfer_data_entry(
obj.transfer_data_ownership, obj.transfer_data_ownership,
get_basename(constants.PARENT_TRANSFER_INFO_NAME), get_basename(constants.PARENT_TRANSFER_INFO_NAME),
constants.SHAPE_KEY_KEY, constants.PARENT_KEY,
) )
if len(matches) != 0: if len(matches) != 0: