Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflicts

Browse source
This commit is contained in:
Kayla Man 2022-12-09 19:21:17 +08:00
parent 8a533e59b2
commit b52018fc62
248 changed files with 7288 additions and 2337 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openpype/settings/defaults/project_anatomy/templates.json
View file

@ -48,10 +48,16 @@
"file": "{originalBasename}_{@version}.{ext}",
"path": "{@folder}/{@file}"
},
"online": {
"folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}",
"file": "{originalBasename}<.{@frame}><_{udim}>.{ext}",
"path": "{@folder}/{@file}"
},
"__dynamic_keys_labels__": {
"maya2unreal": "Maya to Unreal",
"simpleUnrealTextureHero": "Simple Unreal Texture - Hero",
"simpleUnrealTexture": "Simple Unreal Texture"
"simpleUnrealTexture": "Simple Unreal Texture",
"online": "online"
}
}
}

12
openpype/settings/defaults/project_settings/celaction.json
View file

@ -1,13 +1,9 @@
{
"publish": {
"ExtractCelactionDeadline": {
"enabled": true,
"deadline_department": "",
"deadline_priority": 50,
"deadline_pool": "",
"deadline_pool_secondary": "",
"deadline_group": "",
"deadline_chunk_size": 10
"CollectRenderPath": {
"output_extension": "png",
"anatomy_template_key_render_files": "render",
"anatomy_template_key_metadata": "render"
}
}
}

10
openpype/settings/defaults/project_settings/deadline.json
View file

@ -70,6 +70,16 @@
"department": "",
"multiprocess": true
},
"CelactionSubmitDeadline": {
"enabled": true,
"deadline_department": "",
"deadline_priority": 50,
"deadline_pool": "",
"deadline_pool_secondary": "",
"deadline_group": "",
"deadline_chunk_size": 10,
"deadline_job_delay": "00:00:00:00"
},
"ProcessSubmittedJobOnFarm": {
"enabled": true,
"deadline_department": "",

15
openpype/settings/defaults/project_settings/global.json
View file

@ -24,6 +24,10 @@
],
"skip_hosts_headless_publish": []
},
"collect_comment_per_instance": {
"enabled": false,
"families": []
},
"ValidateEditorialAssetName": {
"enabled": true,
"optional": false
@ -288,6 +292,17 @@
"task_types": [],
"tasks": [],
"template_name": "maya2unreal"
},
{
"families": [
"online"
],
"hosts": [
"traypublisher"
],
"task_types": [],
"tasks": [],
"template_name": "online"
}
]
},

21
openpype/settings/defaults/project_settings/maya.json
View file

@ -179,7 +179,21 @@
"enabled": true,
"defaults": [
"Main"
]
],
"expandProcedurals": false,
"motionBlur": true,
"motionBlurKeys": 2,
"motionBlurLength": 0.5,
"maskOptions": false,
"maskCamera": false,
"maskLight": false,
"maskShape": false,
"maskShader": false,
"maskOverride": false,
"maskDriver": false,
"maskFilter": false,
"maskColor_manager": false,
"maskOperator": false
},
"CreateAssembly": {
"enabled": true,
@ -258,6 +272,9 @@
"CollectFbxCamera": {
"enabled": false
},
"CollectGLTF": {
"enabled": false
},
"ValidateInstanceInContext": {
"enabled": true,
"optional": true,
@ -1022,4 +1039,4 @@
"ValidateNoAnimation": false
}
}
}
}

5
openpype/settings/defaults/project_settings/tvpaint.json
View file

@ -11,6 +11,11 @@
255,
255,
255
],
"families_to_review": [
"review",
"renderlayer",
"renderscene"
]
},
"ValidateProjectSettings": {

35
openpype/settings/defaults/system_settings/applications.json
View file

@ -114,6 +114,35 @@
}
}
},
"3dsmax": {
"enabled": true,
"label": "3ds max",
"icon": "{}/app_icons/3dsmax.png",
"host_name": "max",
"environment": {
"ADSK_3DSMAX_STARTUPSCRIPTS_ADDON_DIR": "{OPENPYPE_ROOT}\\openpype\\hosts\\max\\startup"
},
"variants": {
"2023": {
"use_python_2": false,
"executables": {
"windows": [
"C:\\Program Files\\Autodesk\\3ds Max 2023\\3dsmax.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {
"3DSMAX_VERSION": "2023"
}
}
}
},
"flame": {
"enabled": true,
"label": "Flame",
@ -1268,12 +1297,12 @@
"CELACTION_TEMPLATE": "{OPENPYPE_REPOS_ROOT}/openpype/hosts/celaction/celaction_template_scene.scn"
},
"variants": {
"local": {
"current": {
"enabled": true,
"variant_label": "Local",
"variant_label": "Current",
"use_python_2": false,
"executables": {
"windows": [],
"windows": ["C:/Program Files/CelAction/CelAction2D Studio/CelAction2D.exe"],
"darwin": [],
"linux": []
},