studio/blender-studio-tools
13
32
Fork 19
Code Issues 22 Pull Requests 4 Projects Releases 1 Activity

Asset Pipeline: Add Support for Asset Catalogs #185

Merged
Nick Alberelli merged 7 commits from TinyNick/blender-studio-pipeline:feature/asset-pipeline-set-catalog into main 2024-01-09 23:28:34 +01:00
Conversation 2 Commits 7 Files Changed 6 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4e6c681491 - Show all commits

4
scripts-blender/addons/asset_pipeline/ui.py
View File

@ -54,7 +54,6 @@ class ASSETPIPE_PT_sync(bpy.types.Panel):
for task_layer in asset_pipe.local_task_layers: for task_layer in asset_pipe.local_task_layers:
row.label(text=task_layer.name) row.label(text=task_layer.name)
layout.prop(asset_pipe, 'aval_asset_catalogs')
layout.prop(asset_pipe, "asset_collection") layout.prop(asset_pipe, "asset_collection")
staged = is_staged_publish(Path(bpy.data.filepath)) staged = is_staged_publish(Path(bpy.data.filepath))
@ -90,6 +89,9 @@ class ASSETPIPE_PT_sync_tools(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
cat_row = layout.row(align=True)
cat_row.prop(context.scene.asset_pipeline, 'asset_catalog_id')
cat_row.operator("assetpipe.refresh_asset_cat", icon='FILE_REFRESH', text="")
layout.operator("assetpipe.batch_ownership_change") layout.operator("assetpipe.batch_ownership_change")
layout.operator("assetpipe.revert_file", icon="FILE_TICK") layout.operator("assetpipe.revert_file", icon="FILE_TICK")