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

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

@ -35,6 +35,12 @@ class ASSETPIPE_sync(bpy.types.Panel):
"assetpipe.sync_with_publish", text="Pull from Publish", icon="TRIA_DOWN" "assetpipe.sync_with_publish", text="Pull from Publish", icon="TRIA_DOWN"
).pull = True ).pull = True
if asset_pipe.is_asset_pipeline_file and asset_pipe.task_layer_name == "NONE":
asset_pipe = context.scene.asset_pipeline
box = layout.box()
box.label(text="Published File Settings")
box.prop(asset_pipe, "is_depreciated")
class ASSETPIPE_ownership_inspector(bpy.types.Panel): class ASSETPIPE_ownership_inspector(bpy.types.Panel):
bl_space_type = 'VIEW_3D' bl_space_type = 'VIEW_3D'
@ -60,13 +66,6 @@ class ASSETPIPE_ownership_inspector(bpy.types.Panel):
layout.label(text=f"{obj.name}: '{owner}'", icon="OBJECT_DATA") layout.label(text=f"{obj.name}: '{owner}'", icon="OBJECT_DATA")
transfer_ui.draw_transfer_data(transfer_data, layout) transfer_ui.draw_transfer_data(transfer_data, layout)
task_layer_name = core.get_task_layer_name_from_file()
if task_layer_name not in constants.TASK_LAYER_KEYS:
asset_pipe = context.scene.asset_pipeline
box = layout.box()
box.label(text="Published File Settings")
box.prop(asset_pipe, "is_depreciated")
classes = ( classes = (
ASSETPIPE_sync, ASSETPIPE_sync,