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

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

@ -24,16 +24,17 @@ class ASSETPIPE_sync(bpy.types.Panel):
)
layout.prop(asset_pipe, "asset_collection", text="Asset")
layout.label(text="Test UI")
layout.operator("assetpipe.publish_new_version")
layout.operator(
"assetpipe.sync_with_publish", text="Update Ownership"
).pull = False
# layout.operator(
# "assetpipe.sync_with_publish", text="Update Ownership"
# ).pull = False
layout.operator(
"assetpipe.sync_with_publish", text="Push to Publish", icon="TRIA_UP"
).push = True
layout.operator(
"assetpipe.sync_with_publish", text="Pull from Publish", icon="TRIA_DOWN"
).pull = True
layout.operator("assetpipe.publish_new_version", icon="PLUS")
if asset_pipe.is_asset_pipeline_file and asset_pipe.task_layer_name == "NONE":
asset_pipe = context.scene.asset_pipeline