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

1
scripts-blender/addons/asset_pipeline_2/merge/transfer_data/transfer_ui.py
View File

@ -36,7 +36,6 @@ def draw_transfer_data_type(
"assetpipe.update_surrendered_transfer_data" "assetpipe.update_surrendered_transfer_data"
).transfer_data_item_name = transfer_data_item.name ).transfer_data_item_name = transfer_data_item.name
row.enabled = enabled row.enabled = enabled
return
else: else:
row.prop(transfer_data_item, "surrender", text="Surrender") row.prop(transfer_data_item, "surrender", text="Surrender")
draw_task_layer_selection( draw_task_layer_selection(