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

10
scripts-blender/addons/asset_pipeline_2/props.py
View File

@ -71,7 +71,11 @@ class AssetPipeline(bpy.types.PropertyGroup):
description="Depreciated files do not recieve any updates when syncing from a task layer", description="Depreciated files do not recieve any updates when syncing from a task layer",
default=False, default=False,
) )
asset_collection: bpy.props.PointerProperty(type=bpy.types.Collection) asset_collection: bpy.props.PointerProperty(
type=bpy.types.Collection,
name="Asset",
description="Top Level Collection of the Asset, all other collections of the asset will be children of this collection",
)
temp_transfer_data: bpy.props.CollectionProperty(type=AssetTransferDataTemp) temp_transfer_data: bpy.props.CollectionProperty(type=AssetTransferDataTemp)
@ -89,8 +93,8 @@ class AssetPipeline(bpy.types.PropertyGroup):
new_file_mode: bpy.props.EnumProperty( new_file_mode: bpy.props.EnumProperty(
name="New File Mode", name="New File Mode",
items=( items=(
('KEEP', "Current File", "Update Selected Objects Only"), ('KEEP', "Current File", "Setup the Existing File/Directory as an Asset"),
('BLANK', "Blank", "Update All Objects"), ('BLANK', "Blank File", "Create a New Blank Asset in a New Directory"),
), ),
) )

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

@ -53,7 +53,7 @@ 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, "asset_collection", text="Asset") layout.prop(asset_pipe, "asset_collection")
layout.operator("assetpipe.update_ownership", text="Update Ownership") 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")