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

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

@ -69,20 +69,20 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
def draw(self, context: bpy.types.Context): def draw(self, context: bpy.types.Context):
layout = self.layout layout = self.layout
ownership = context.scene.temp_transfer_data_ownership
row = layout.row() row = layout.row()
if self.push: if self.push:
row.prop(self, "pull") row.prop(self, "pull")
row.prop(self, "save") row.prop(self, "save")
if self._new_transfer_data: if len(ownership) == 0:
layout.label(text="New Transfer Data will be Pushed to Publish")
else:
layout.label(text="No New Transfer Data found") layout.label(text="No New Transfer Data found")
else:
# TODO re-use transfer UI here layout.label(text="New Transfer Data will be Pushed to Publish")
for key in constants.TRANSFER_DATA_KEYS: # TODO SORT PER OBJECT AND DRAW FOR EACH OBJ
self.draw_transfer_data_items(layout, key) # TODO Store ownership in self for easier access
transfer_ui.draw_transfer_data(ownership, layout)
def execute(self, context: bpy.types.Context): def execute(self, context: bpy.types.Context):
# Find current task Layer # Find current task Layer

2
scripts-blender/addons/asset_pipeline_2/transfer_data/transfer_ui.py
View File

@ -2,6 +2,8 @@ from .. import constants, core
def draw_transfer_data_type(layout, items): def draw_transfer_data_type(layout, items):
if items == []:
return
name = core.get_enum_item(constants.TRANSFER_DATA_TYPES, items[0].type)[1] name = core.get_enum_item(constants.TRANSFER_DATA_TYPES, items[0].type)[1]
box = layout.box() box = layout.box()
box.label(text=name, icon=items[0].type) box.label(text=name, icon=items[0].type)