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

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

@ -94,6 +94,12 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
_temp_transfer_data = None _temp_transfer_data = None
_invalid_objs = [] _invalid_objs = []
expand: bpy.props.BoolProperty(
name="Show New Transfer Data",
default=False,
description="Show New Transfer Data",
)
save: bpy.props.BoolProperty( save: bpy.props.BoolProperty(
name="Save Current File", name="Save Current File",
default=True, default=True,
@ -150,9 +156,14 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
layout.label(text="No New Transfer Data found") layout.label(text="No New Transfer Data found")
else: else:
layout.label(text="New Transfer Data will be Pushed to Publish") layout.label(text="New Transfer Data will be Pushed to Publish")
row = layout.row()
row.prop(self, "expand", text="", icon="COLLAPSEMENU", toggle=False)
row.label(text="Show New Transfer Data")
objs = [transfer_info.obj for transfer_info in self._temp_transfer_data] objs = [transfer_info.obj for transfer_info in self._temp_transfer_data]
if not self.expand:
return
for obj in set(objs): for obj in set(objs):
obj_ownership = [ obj_ownership = [
transfer_info transfer_info