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

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

@ -54,7 +54,6 @@ class ASSETPIPE_PT_sync(bpy.types.Panel):
layout.prop(asset_pipe, "asset_collection") layout.prop(asset_pipe, "asset_collection")
layout.operator("assetpipe.update_ownership", text="Update Ownership")
layout.operator("assetpipe.sync_push", text="Push to Publish", icon="TRIA_UP") layout.operator("assetpipe.sync_push", text="Push to Publish", icon="TRIA_UP")
layout.operator( layout.operator(
"assetpipe.sync_pull", text="Pull from Publish", icon="TRIA_DOWN" "assetpipe.sync_pull", text="Pull from Publish", icon="TRIA_DOWN"
@ -80,9 +79,11 @@ class ASSETPIPE_PT_sync_advanced(bpy.types.Panel):
def draw(self, context: bpy.types.Context) -> None: def draw(self, context: bpy.types.Context) -> None:
layout = self.layout layout = self.layout
box = layout.box() box = layout.box()
box.operator("assetpipe.update_ownership", text="Update Ownership")
box.operator("assetpipe.reset_ownership", icon="LOOP_BACK") box.operator("assetpipe.reset_ownership", icon="LOOP_BACK")
box.operator("assetpipe.fix_prefixes", icon="CHECKMARK")
box.operator("assetpipe.batch_ownership_change") box.operator("assetpipe.batch_ownership_change")
box = layout.box()
box.operator("assetpipe.fix_prefixes", icon="CHECKMARK")
box.operator("assetpipe.revert_file", icon="FILE_TICK") box.operator("assetpipe.revert_file", icon="FILE_TICK")
# Task Layer Updater # Task Layer Updater