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

6
scripts-blender/addons/asset_pipeline_2/config.py
View File

@ -4,7 +4,7 @@ import json
from . import constants from . import constants
TASK_LAYER_TYPES = {} TASK_LAYER_TYPES = {}
TASK_LAYER_DEFAULTS = {} TRANSFER_DATA_DEFAULTS = {}
ATTRIBUTE_DEFAULTS = {} ATTRIBUTE_DEFAULTS = {}
@ -22,7 +22,7 @@ def get_task_layer_presets_path():
def verify_json_data(json_file_path=""): def verify_json_data(json_file_path=""):
global TASK_LAYER_TYPES global TASK_LAYER_TYPES
global TASK_LAYER_DEFAULTS global TRANSFER_DATA_DEFAULTS
global ATTRIBUTE_DEFAULTS global ATTRIBUTE_DEFAULTS
directory = Path(bpy.data.filepath).parent directory = Path(bpy.data.filepath).parent
if json_file_path == "": if json_file_path == "":
@ -33,7 +33,7 @@ def verify_json_data(json_file_path=""):
json_content = json.load(json_file) json_content = json.load(json_file)
try: try:
TASK_LAYER_TYPES = json_content["TASK_LAYER_TYPES"] TASK_LAYER_TYPES = json_content["TASK_LAYER_TYPES"]
TASK_LAYER_DEFAULTS = json_content["TASK_LAYER_DEFAULTS"] TRANSFER_DATA_DEFAULTS = json_content["TRANSFER_DATA_DEFAULTS"]
ATTRIBUTE_DEFAULTS = json_content["ATTRIBUTE_DEFAULTS"] ATTRIBUTE_DEFAULTS = json_content["ATTRIBUTE_DEFAULTS"]
return True return True
except KeyError: except KeyError:

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

@ -12,8 +12,8 @@ def get_default_task_layer_owner(td_type: str, name="") -> [str, bool]:
config.ATTRIBUTE_DEFAULTS[name]['auto_surrender'], config.ATTRIBUTE_DEFAULTS[name]['auto_surrender'],
) )
return ( return (
config.TASK_LAYER_DEFAULTS[td_type]['default_owner'], config.TRANSFER_DATA_DEFAULTS[td_type]['default_owner'],
config.TASK_LAYER_DEFAULTS[td_type]['auto_surrender'], config.TRANSFER_DATA_DEFAULTS[td_type]['auto_surrender'],
) )

2
scripts-blender/addons/asset_pipeline_2/props.py
View File

@ -6,7 +6,7 @@ from pathlib import Path
from .prefs import get_addon_prefs from .prefs import get_addon_prefs
""" NOTE Items in these properties groups should be generated by a function that finds the """ NOTE Items in these properties groups should be generated by a function that finds the
avaliable task layers from the task_layer_defaults.json file that needs to be created. avaliable task layers from the task_layer.json file that needs to be created.
""" """

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

@ -4,7 +4,7 @@
"Rigging": "RIG", "Rigging": "RIG",
"Shading": "SHD" "Shading": "SHD"
}, },
"TASK_LAYER_DEFAULTS": { "TRANSFER_DATA_DEFAULTS": {
"GROUP_VERTEX": { "GROUP_VERTEX": {
"default_owner": "Rigging", "default_owner": "Rigging",
"auto_surrender": false "auto_surrender": false

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

@ -3,7 +3,7 @@
"Modeling": "MOD", "Modeling": "MOD",
"Shading": "SHD" "Shading": "SHD"
}, },
"TASK_LAYER_DEFAULTS": { "TRANSFER_DATA_DEFAULTS": {
"GROUP_VERTEX": { "GROUP_VERTEX": {
"default_owner": "Modeling", "default_owner": "Modeling",
"auto_surrender": false "auto_surrender": false