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

8
scripts-blender/addons/asset_pipeline_2/sync.py
View File

@ -15,6 +15,7 @@ from .merge.transfer_data.transfer_ui import draw_transfer_data
from .merge.shared_ids import get_shared_id_icon from .merge.shared_ids import get_shared_id_icon
from . import constants from . import constants
from . import config from . import config
from .merge.task_layer import draw_task_layer_selection
def sync_poll(cls, context): def sync_poll(cls, context):
@ -64,7 +65,12 @@ def sync_draw(self, context):
box = layout.box() box = layout.box()
box.label(text="New 'Shared IDs' found") box.label(text="New 'Shared IDs' found")
for id in self._shared_ids: for id in self._shared_ids:
box.label(text=id.name, icon=get_shared_id_icon(id)) row = box.row()
row.label(text=id.name, icon=get_shared_id_icon(id))
draw_task_layer_selection(
layout=row,
data=id,
)
if len(self._temp_transfer_data) == 0: if len(self._temp_transfer_data) == 0:
layout.label(text="No new local Transfer Data found") layout.label(text="No new local Transfer Data found")