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

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

@ -23,7 +23,6 @@ def draw_transfer_data_type(
if not bool(asset_pipe.get(ui_bool)): if not bool(asset_pipe.get(ui_bool)):
return return
scene = bpy.context.scene
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}: ")
@ -34,17 +33,29 @@ def draw_transfer_data_type(
if transfer_data_item.owner in asset_pipe.get_local_task_layers() if transfer_data_item.owner in asset_pipe.get_local_task_layers()
else True else True
) )
row.operator( # Disable entire row if the item is surrender (prevents user from un-surrendering)
row.enabled = enabled
col = row.column()
col.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 = enabled
else: # New Row inside a column because draw_task_layer_selection() will enable/disable the entire row
row.prop(transfer_data_item, "surrender", text="Surrender") # Only need this to affect itself and the "surrender" property
col = row.column()
task_layer_row = col.row()
draw_task_layer_selection( draw_task_layer_selection(
layout=row, layout=task_layer_row,
data=transfer_data_item, data=transfer_data_item,
show_all_task_layers=transfer_data_item.get("use_default_owner"), show_all_task_layers=transfer_data_item.get("use_default_owner"),
) )
surrender_icon = (
"ORPHAN_DATA" if transfer_data_item.get("surrender") else "HEART"
)
task_layer_row.prop(
transfer_data_item, "surrender", text="", icon=surrender_icon
)
def draw_transfer_data( def draw_transfer_data(

15
scripts-blender/addons/asset_pipeline_2/ui.py
View File

@ -135,11 +135,18 @@ class ASSETPIPE_PT_ownership_inspector(bpy.types.Panel):
if obj.asset_id_owner in asset_pipe.get_local_task_layers() if obj.asset_id_owner in asset_pipe.get_local_task_layers()
else True else True
) )
row.operator("assetpipe.update_surrendered_object")
row.enabled = enabled row.enabled = enabled
else: col = row.column()
row.prop(obj, "asset_id_surrender", text="Surrender") col.operator("assetpipe.update_surrendered_object")
draw_task_layer_selection(layout=row, data=obj)
# New Row inside a column because draw_task_layer_selection() will enable/disable the entire row
# Only need this to affect itself and the "surrender" property
col = row.column()
task_layer_row = col.row()
draw_task_layer_selection(layout=task_layer_row, data=obj)
surrender_icon = "ORPHAN_DATA" if obj.get("asset_id_surrender") else "HEART"
task_layer_row.prop(obj, "asset_id_surrender", text="", icon=surrender_icon)
draw_transfer_data(transfer_data, layout) draw_transfer_data(transfer_data, layout)