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

5
scripts-blender/addons/asset_pipeline_2/merge/task_layer.py
View File

@ -7,8 +7,9 @@ from .. import config
def get_default_task_layer(td_type: str, name=""):
if td_type == constants.ATTRIBUTE_KEY:
if name in config.DEFAULT_OWNERSHIP_ATTRIBUTES:
return config.DEFAULT_OWNERSHIP_ATTRIBUTES[name]
return config.DEFAULT_OWNERSHIP[td_type]
return config.DEFAULT_OWNERSHIP_ATTRIBUTES[name]['default_owner']
print(config.DEFAULT_OWNERSHIP[td_type]['default_owner'])
return config.DEFAULT_OWNERSHIP[td_type]['default_owner']
def get_transfer_data_owner(

51
scripts-blender/addons/asset_pipeline_2/task_layer_configs/Character.json
View File

@ -1,20 +1,47 @@
{
"TASK_LAYER_TYPES": {
"Modeling":"MOD",
"Rigging":"RIG",
"Shading":"SHD"
"Modeling": "MOD",
"Rigging": "RIG",
"Shading": "SHD"
},
"DEFAULT_OWNERSHIP": {
"GROUP_VERTEX": "Rigging",
"MODIFIER": "Rigging",
"CONSTRAINT": "Rigging",
"MATERIAL": "Shading",
"SHAPE_KEY": "Modeling",
"ATTRIBUTE": "Rigging",
"PARENT": "Rigging"
"GROUP_VERTEX": {
"default_owner": "Rigging",
"auto_surrender": false
},
"MODIFIER": {
"default_owner": "Rigging",
"auto_surrender": false
},
"CONSTRAINT": {
"default_owner": "Rigging",
"auto_surrender": false
},
"MATERIAL": {
"default_owner": "Shading",
"auto_surrender": false
},
"SHAPE_KEY": {
"default_owner": "Modeling",
"auto_surrender": false
},
"ATTRIBUTE": {
"default_owner": "Rigging",
"auto_surrender": false
},
"PARENT": {
"default_owner": "Rigging",
"auto_surrender": false
}
},
"DEFAULT_OWNERSHIP_ATTRIBUTES": {
"sharp_face": "Modeling",
"UVMap": "Shading"
"sharp_face": {
"default_owner": "Modeling",
"auto_surrender": false
},
"UVMap": {
"default_owner": "Shading",
"auto_surrender": false
}
}
}

49
scripts-blender/addons/asset_pipeline_2/task_layer_configs/Set.json
View File

@ -1,19 +1,46 @@
{
"TASK_LAYER_TYPES": {
"Modeling":"MOD",
"Shading":"SHD"
"Modeling": "MOD",
"Shading": "SHD"
},
"DEFAULT_OWNERSHIP": {
"GROUP_VERTEX": "Modeling",
"MODIFIER": "Modeling",
"CONSTRAINT": "Modeling",
"MATERIAL": "Shading",
"SHAPE_KEY": "Modeling",
"ATTRIBUTE": "Modeling",
"PARENT": "Modeling"
"GROUP_VERTEX": {
"default_owner": "Modeling",
"auto_surrender": false
},
"MODIFIER": {
"default_owner": "Modeling",
"auto_surrender": false
},
"CONSTRAINT": {
"default_owner": "Modeling",
"auto_surrender": false
},
"MATERIAL": {
"default_owner": "Shading",
"auto_surrender": false
},
"SHAPE_KEY": {
"default_owner": "Modeling",
"auto_surrender": false
},
"ATTRIBUTE": {
"default_owner": "Modeling",
"auto_surrender": false
},
"PARENT": {
"default_owner": "Modeling",
"auto_surrender": false
}
},
"DEFAULT_OWNERSHIP_ATTRIBUTES": {
"sharp_face": "Modeling",
"UVMap": "Shading"
"sharp_face": {
"default_owner": "Modeling",
"auto_surrender": false
},
"UVMap": {
"default_owner": "Shading",
"auto_surrender": false
}
}
}