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

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

@ -4,8 +4,8 @@ import json
from . import constants from . import constants
TASK_LAYER_TYPES = {} TASK_LAYER_TYPES = {}
DEFAULT_OWNERSHIP = {} TASK_LAYER_DEFAULTS = {}
DEFAULT_OWNERSHIP_ATTRIBUTES = {} ATTRIBUTE_DEFAULTS = {}
def get_json_file(): def get_json_file():
@ -22,8 +22,8 @@ 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 DEFAULT_OWNERSHIP global TASK_LAYER_DEFAULTS
global DEFAULT_OWNERSHIP_ATTRIBUTES global ATTRIBUTE_DEFAULTS
directory = Path(bpy.data.filepath).parent directory = Path(bpy.data.filepath).parent
if json_file_path == "": if json_file_path == "":
json_file_path = directory.joinpath(constants.TASK_LAYER_CONFIG_NAME) json_file_path = directory.joinpath(constants.TASK_LAYER_CONFIG_NAME)
@ -33,8 +33,8 @@ 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"]
DEFAULT_OWNERSHIP = json_content["DEFAULT_OWNERSHIP"] TASK_LAYER_DEFAULTS = json_content["TASK_LAYER_DEFAULTS"]
DEFAULT_OWNERSHIP_ATTRIBUTES = json_content["DEFAULT_OWNERSHIP_ATTRIBUTES"] ATTRIBUTE_DEFAULTS = json_content["ATTRIBUTE_DEFAULTS"]
return True return True
except KeyError: except KeyError:
return return

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

@ -6,15 +6,15 @@ from .. import config
def get_default_task_layer_owner(td_type: str, name="") -> [str, bool]: def get_default_task_layer_owner(td_type: str, name="") -> [str, bool]:
if td_type == constants.ATTRIBUTE_KEY: if td_type == constants.ATTRIBUTE_KEY:
if name in config.DEFAULT_OWNERSHIP_ATTRIBUTES: if name in config.ATTRIBUTE_DEFAULTS:
return ( return (
config.DEFAULT_OWNERSHIP_ATTRIBUTES[name]['default_owner'], config.ATTRIBUTE_DEFAULTS[name]['default_owner'],
config.DEFAULT_OWNERSHIP_ATTRIBUTES[name]['auto_surrender'], config.ATTRIBUTE_DEFAULTS[name]['auto_surrender'],
) )
print(config.DEFAULT_OWNERSHIP[td_type]['default_owner']) print(config.TASK_LAYER_DEFAULTS[td_type]['default_owner'])
return ( return (
config.DEFAULT_OWNERSHIP[td_type]['default_owner'], config.TASK_LAYER_DEFAULTS[td_type]['default_owner'],
config.DEFAULT_OWNERSHIP[td_type]['auto_surrender'], config.TASK_LAYER_DEFAULTS[td_type]['auto_surrender'],
) )

4
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"
}, },
"DEFAULT_OWNERSHIP": { "TASK_LAYER_DEFAULTS": {
"GROUP_VERTEX": { "GROUP_VERTEX": {
"default_owner": "Rigging", "default_owner": "Rigging",
"auto_surrender": false "auto_surrender": false
@ -34,7 +34,7 @@
"auto_surrender": false "auto_surrender": false
} }
}, },
"DEFAULT_OWNERSHIP_ATTRIBUTES": { "ATTRIBUTE_DEFAULTS": {
"sharp_face": { "sharp_face": {
"default_owner": "Modeling", "default_owner": "Modeling",
"auto_surrender": false "auto_surrender": false

4
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"
}, },
"DEFAULT_OWNERSHIP": { "TASK_LAYER_DEFAULTS": {
"GROUP_VERTEX": { "GROUP_VERTEX": {
"default_owner": "Modeling", "default_owner": "Modeling",
"auto_surrender": false "auto_surrender": false
@ -33,7 +33,7 @@
"auto_surrender": false "auto_surrender": false
} }
}, },
"DEFAULT_OWNERSHIP_ATTRIBUTES": { "ATTRIBUTE_DEFAULTS": {
"sharp_face": { "sharp_face": {
"default_owner": "Modeling", "default_owner": "Modeling",
"auto_surrender": false "auto_surrender": false