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

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

@ -1,6 +1,6 @@
import bpy import bpy
from ... import constants from ... import constants
from ..task_layer import draw_task_layer_selection from ..task_layer import draw_task_layer_selection, get_local_task_layers
def draw_transfer_data_type( def draw_transfer_data_type(
@ -27,20 +27,26 @@ def draw_transfer_data_type(
for transfer_data_item in transfer_data: for transfer_data_item in transfer_data:
row = box.row() row = box.row()
row.label(text=f"{transfer_data_item.name}: ") row.label(text=f"{transfer_data_item.name}: ")
row.prop(transfer_data_item, "surrender", text="Surrender")
draw_task_layer_selection(
row,
scene,
transfer_data_item,
transfer_data_item.owner,
"owner",
transfer_data_item.get("use_default_owner"),
)
if transfer_data_item.get("surrender"): if transfer_data_item.get("surrender"):
enabled = (
False if transfer_data_item.owner in get_local_task_layers() else True
)
row.operator( row.operator(
"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 = True row.enabled = enabled
return
else:
row.prop(transfer_data_item, "surrender", text="Surrender")
draw_task_layer_selection(
row,
scene,
transfer_data_item,
transfer_data_item.owner,
"owner",
transfer_data_item.get("use_default_owner"),
)
def draw_transfer_data( def draw_transfer_data(