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

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

@ -63,9 +63,9 @@ def sync_draw(self, context):
box.label(text=id.name) box.label(text=id.name)
if len(self._temp_transfer_data) == 0: if len(self._temp_transfer_data) == 0:
layout.label(text="No New Transfer Data found") layout.label(text="No new local Transfer Data found")
else: else:
layout.label(text="New Transfer Data will be Pushed to Publish") layout.label(text="New local Transfer Data will be Pushed to Publish")
row = layout.row() row = layout.row()
row.prop(self, "expand", text="", icon="COLLAPSEMENU", toggle=False) row.prop(self, "expand", text="", icon="COLLAPSEMENU", toggle=False)
row.label(text="Show New Transfer Data") row.label(text="Show New Transfer Data")