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

24
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 get_local_task_layers from ..task_layer import draw_task_layer_selection
def draw_transfer_data_type( def draw_transfer_data_type(
@ -14,26 +14,10 @@ def draw_transfer_data_type(
box.label(text=name, icon=icon) box.label(text=name, icon=icon)
scene = bpy.context.scene scene = bpy.context.scene
for transfer_data_item in transfer_data: for transfer_data_item in transfer_data:
row = layout.row() row = box.row()
row.label(text=f"{transfer_data_item.name}: ") row.label(text=f"{transfer_data_item.name}: ")
if transfer_data_item.owner not in [ draw_task_layer_selection(
tl.name for tl in scene.asset_pipeline.local_task_layers row, scene, transfer_data_item, transfer_data_item.owner, "owner"
]:
row.enabled = False
row.prop_search(
transfer_data_item,
'owner',
scene.asset_pipeline,
'all_task_layers',
text="",
)
else:
row.prop_search(
transfer_data_item,
'owner',
scene.asset_pipeline,
'local_task_layers',
text="",
) )