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

Merge branch 'develop' into enhancement/OP-3807_playblast_profiles

Browse source 
# Conflicts:
#	openpype/hosts/maya/plugins/publish/collect_review.py
#	openpype/settings/defaults/project_settings/maya.json
#	openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
This commit is contained in:
Toke Stuart Jepsen 2023-04-05 08:00:58 +01:00
commit d2be161184
223 changed files with 7133 additions and 6965 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,6 +110,7 @@
"CreateLook": {
"enabled": true,
"make_tx": true,
"rs_tex": false,
"defaults": [
"Main"
]
@ -818,7 +819,8 @@
125,
255
],
"override_display": true
"override_display": true,
"displayGradient": true
},
"Generic": {
"isolate_view": true,
@ -932,6 +934,24 @@
"enabled": true,
"active": true,
"ogsfx_path": "/maya2glTF/PBR/shaders/glTF_PBR.ogsfx"
},
"ExtractLook": {
"maketx_arguments": []
},
"ExtractGPUCache": {
"enabled": false,
"families": [
"model",
"animation",
"pointcache"
],
"step": 1.0,
"stepSave": 1,
"optimize": true,
"optimizationThreshold": 40000,
"optimizeAnimationsForMotionBlur": true,
"writeMaterials": true,
"useBaseTessellation": true
}
},
"load": {

2
openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
View file

@ -597,7 +597,7 @@
"type": "dict",
"collapsible": true,
"key": "options",
"label": "Burnin formating options",
"label": "Burnin formatting options",
"children": [
{
"type": "number",

7
openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
View file

@ -64,7 +64,6 @@
"maximum": 100,
"default": 95
},
{
"type": "splitter"
}
@ -102,6 +101,12 @@
"key": "override_display",
"label": "Override display options",
"default": true
},
{
"type": "boolean",
"key": "displayGradient",
"label": "Display background gradient",
"default": true
}
]
},

5
openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
View file

@ -21,6 +21,11 @@
"key": "make_tx",
"label": "Make tx files"
},
{
"type": "boolean",
"key": "rs_tex",
"label": "Make Redshift texture files"
},
{
"type": "list",
"key": "defaults",

88
openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
View file

@ -996,6 +996,94 @@
"label": "GLSL Shader Directory"
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "ExtractLook",
"label": "Extract Look",
"children": [
{
"type": "list",
"key": "maketx_arguments",
"label": "Extra arguments for maketx command line",
"object_type": {
"type": "dict",
"children": [
{
"key": "argument",
"label": "Argument",
"type": "text"
},
{
"key": "parameters",
"label": "Parameters",
"type": "list",
"object_type": "text"
}
]
}
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "ExtractGPUCache",
"label": "Extract GPU Cache",
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"key": "families",
"label": "Families",
"type": "list",
"object_type": "text"
},
{
"key": "step",
"label": "Step",
"type": "number",
"decimal": 4,
"minimum": 1
},
{
"key": "stepSave",
"label": "Step Save",
"type": "number",
"minimum": 1
},
{
"key": "optimize",
"label": "Optimize Hierarchy",
"type": "boolean"
},
{
"key": "optimizationThreshold",
"label": "Optimization Threshold",
"type": "number",
"minimum": 1
},
{
"key": "optimizeAnimationsForMotionBlur",
"label": "Optimize Animations For Motion Blur",
"type": "boolean"
},
{
"key": "writeMaterials",
"label": "Write Materials",
"type": "boolean"
},
{
"key": "useBaseTessellation",
"label": "User Base Tesselation",
"type": "boolean"
}
]
}
]
}