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

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

@ -12,6 +12,7 @@ class ASSET_STATUS(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)
from . import constants from . import constants

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

@ -12,9 +12,11 @@ class ASSETPIPE_sync(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
status = context.scene.asset_status
layout.label( layout.label(
text=f"Active Task Layer: {context.collection.name.split('.')[-1]}" text=f"Active Task Layer: {context.collection.name.split('.')[-1]}"
) )
layout.prop(status, "asset_collection", text="Asset")
layout.label(text="Test UI") layout.label(text="Test UI")
layout.operator("assetpipe.publish_new_version") layout.operator("assetpipe.publish_new_version")
layout.operator("assetpipe.sync_with_publish", text="Update Ownership") layout.operator("assetpipe.sync_with_publish", text="Update Ownership")