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
4 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 0e2ce0de82 - Show all commits

4
scripts-blender/addons/asset_pipeline_2/core.py
View File

@ -198,7 +198,7 @@ def get_task_layer_name_from_file():
return task_layer_name return task_layer_name
def get_enum_item(enum, key): def get_dict_tuple_item(dict: dict, key: str) -> tuple:
for item in enum: for item in dict:
if item[0] == key: if item[0] == key:
return item return item

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

@ -178,7 +178,7 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
error_msg = core.merge_task_layer( error_msg = core.merge_task_layer(
context, context,
local_tls=[task_layer_name], local_tls=[task_layer_name],
target_file=sync_target, external_file=sync_target,
) )
if error_msg: if error_msg:
@ -212,7 +212,7 @@ class ASSETPIPE_OT_sync_with_publish(bpy.types.Operator):
error_msg = core.merge_task_layer( error_msg = core.merge_task_layer(
context, context,
local_tls=local_tls, local_tls=local_tls,
target_file=current_file, external_file=current_file,
) )
if error_msg: if error_msg:
bpy.ops.wm.open_mainfile(filepath=current_file.__str__()) bpy.ops.wm.open_mainfile(filepath=current_file.__str__())

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

@ -4,11 +4,11 @@ from .. import constants, core
def draw_transfer_data_type(layout, items): def draw_transfer_data_type(layout, items):
if items == []: if items == []:
return return
name = core.get_enum_item(constants.TRANSFER_DATA_TYPES, items[0].type)[1] name = core.get_dict_tuple_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)
for item in items: for item in items:
owner = core.get_enum_item(constants.TASK_LAYER_ITEMS, item.owner)[1] owner = core.get_dict_tuple_item(constants.TASK_LAYER_ITEMS, item.owner)[1]
box.label(text=f"{item.name}: '{owner}'") box.label(text=f"{item.name}: '{owner}'")

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

@ -53,7 +53,9 @@ class ASSETPIPE_ownership_inspector(bpy.types.Panel):
obj = context.active_object obj = context.active_object
ownership = obj.transfer_data_ownership ownership = obj.transfer_data_ownership
layout = layout.box() layout = layout.box()
owner = core.get_enum_item(constants.TASK_LAYER_ITEMS, obj.asset_id_owner)[1] owner = core.get_dict_tuple_item(
constants.TASK_LAYER_ITEMS, obj.asset_id_owner
)[1]
layout.label(text=f"{obj.name}: '{owner}'", icon="OBJECT_DATA") layout.label(text=f"{obj.name}: '{owner}'", icon="OBJECT_DATA")
transfer_ui.draw_transfer_data(ownership, layout) transfer_ui.draw_transfer_data(ownership, layout)