studio/blender-studio-tools
13
32
Fork 19
Code Issues 22 Pull Requests 4 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 +9 -5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57876b1548 - Show all commits

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

@ -15,8 +15,6 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
bl_label = "Sync with Publish" bl_label = "Sync with Publish"
bl_description = """Push and or Pull data from Published file. Will prompt with a list of new data found before pushing""" bl_description = """Push and or Pull data from Published file. Will prompt with a list of new data found before pushing"""
_new_transfer_data = {}
save: bpy.props.BoolProperty( save: bpy.props.BoolProperty(
name="Save Current File", name="Save Current File",
default=True, default=True,
@ -34,6 +32,7 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
) )
def invoke(self, context: bpy.types.Context, event: bpy.types.Event): def invoke(self, context: bpy.types.Context, event: bpy.types.Event):
# TODO Store ownership in self for easier access?
ownership = context.scene.temp_transfer_data_ownership ownership = context.scene.temp_transfer_data_ownership
ownership.clear() ownership.clear()
@ -65,9 +64,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")
# TODO SORT PER OBJECT AND DRAW FOR EACH OBJ
# TODO Store ownership in self for easier access objs = [item.obj for item in ownership]
transfer_ui.draw_transfer_data(ownership, layout)
for obj in set(objs):
obj_ownership = [item for item in ownership if item.obj == obj]
box = layout.box()
box.label(text=obj.name, icon="OBJECT_DATA")
transfer_ui.draw_transfer_data(obj_ownership, box)
def execute(self, context: bpy.types.Context): def execute(self, context: bpy.types.Context):
# Find current task Layer # Find current task Layer