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

# 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

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": {