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

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

@ -25,7 +25,7 @@ TRANSFER_DATA_TYPES = {
VERTEX_COLOR_KEY: ("Color Attribute", 'GROUP_VCOL'), VERTEX_COLOR_KEY: ("Color Attribute", 'GROUP_VCOL'),
MODIFIER_KEY: ("Modifier", 'MODIFIER'), MODIFIER_KEY: ("Modifier", 'MODIFIER'),
CONSTRAINT_KEY: ("Constraint", 'CONSTRAINT'), CONSTRAINT_KEY: ("Constraint", 'CONSTRAINT'),
MATERIAL_SLOT_KEY: ("Material Slot", 'MATERIAL'), MATERIAL_SLOT_KEY: ("Materials", 'MATERIAL'),
UV_LAYERS_KEY: ("UV Maps", 'GROUP_UVS'), UV_LAYERS_KEY: ("UV Maps", 'GROUP_UVS'),
SHAPE_KEY_KEY: ("Shape Key", 'SHAPEKEY_DATA'), SHAPE_KEY_KEY: ("Shape Key", 'SHAPEKEY_DATA'),
ATTRIBUTE_KEY: ("Attribute", 'EVENT_A'), ATTRIBUTE_KEY: ("Attribute", 'EVENT_A'),
@ -39,7 +39,7 @@ TRANSFER_DATA_TYPES_ENUM_ITEMS = [
for i, tup in enumerate(TRANSFER_DATA_TYPES.items()) for i, tup in enumerate(TRANSFER_DATA_TYPES.items())
] ]
MATERIAL_TRANSFER_DATA_ITEM_NAME = "All Material Slots" MATERIAL_TRANSFER_DATA_ITEM_NAME = "All Materials"
PARENT_TRANSFER_DATA_ITEM_NAME = "Parent Relationship" PARENT_TRANSFER_DATA_ITEM_NAME = "Parent Relationship"
PUBLISH_TYPES = [ PUBLISH_TYPES = [