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

20
scripts-blender/addons/asset_pipeline_2/constants.py
View File

@ -14,13 +14,13 @@ TASK_LAYER_NAMES = [task_layer[1] for task_layer in TASK_LAYER_TYPES]
TRANSFER_DATA_TYPES = [ TRANSFER_DATA_TYPES = [
("NONE", "None", ""), ("NONE", "None", ""),
("GROUP_VERTEX", "Vertex Group", ""), ("GROUP_VERTEX", "Vertex Group", ""),
("GROUP_VCOL", "Color Attribute", ""), ("COLOR_ATTRIBUTE", "Color Attribute", ""),
("MODIFIER", "Modifier", ""), ("MODIFIER", "Modifier", ""),
("CONSTRAINT", "Constraint", ""), ("CONSTRAINT", "Constraint", ""),
("MATERIAL", "Material Slot", ""), ("MATERIAL", "Material Slot", ""),
("GROUP_UVS", "UV Maps", ""), ("UV_MAP", "UV Maps", ""),
("SHAPEKEY_DATA", "Shape Key", ""), ("SHAPE_KEY", "Shape Key", ""),
("EVENT_A", "Attribute", ""), ("ATTRIBUTE", "Attribute", ""),
] ]
TRANSFER_DATA_KEYS = [transfer_data[0] for transfer_data in TRANSFER_DATA_TYPES] TRANSFER_DATA_KEYS = [transfer_data[0] for transfer_data in TRANSFER_DATA_TYPES]
@ -34,6 +34,18 @@ UV_LAYERS_KEY = TRANSFER_DATA_KEYS[6]
SHAPE_KEY_KEY = TRANSFER_DATA_KEYS[7] SHAPE_KEY_KEY = TRANSFER_DATA_KEYS[7]
ATTRIBUTE_KEY = TRANSFER_DATA_KEYS[8] ATTRIBUTE_KEY = TRANSFER_DATA_KEYS[8]
TRANSFER_DATA_ICONS = [
("None", "NONE", ""),
(VERTEX_GROUP_KEY, "GROUP_VERTEX", ""),
(VERTEX_COLOR_KEY, "GROUP_VCOL", ""),
(MODIFIER_KEY, "MODIFIER", ""),
(CONSTRAINT_KEY, "CONSTRAINT", ""),
(MATERIAL_SLOT_KEY, "MATERIAL", ""),
(UV_LAYERS_KEY, "GROUP_UVS", ""),
(SHAPE_KEY_KEY, "SHAPEKEY_DATA", ""),
(ATTRIBUTE_KEY, "EVENT_A", ""),
]
MATERIAL_TRANSFER_INFO_NAME = "All Material Slots" MATERIAL_TRANSFER_INFO_NAME = "All Material Slots"
PUBLISH_TYPES = [ PUBLISH_TYPES = [

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

@ -12,7 +12,10 @@ def draw_transfer_data_type(
constants.TRANSFER_DATA_TYPES, transfer_data[0].type constants.TRANSFER_DATA_TYPES, transfer_data[0].type
)[1] )[1]
box = layout.box() box = layout.box()
box.label(text=name, icon=transfer_data[0].type) icon = core.get_dict_tuple_item(
constants.TRANSFER_DATA_ICONS, transfer_data[0].type
)[1]
box.label(text=name, icon=icon)
for transfer_info in transfer_data: for transfer_info in transfer_data:
owner = core.get_dict_tuple_item( owner = core.get_dict_tuple_item(
constants.TASK_LAYER_TYPES, transfer_info.owner constants.TASK_LAYER_TYPES, transfer_info.owner