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/maya_review

Browse source 
# Conflicts:
#	openpype/hosts/maya/plugins/publish/collect_review.py
This commit is contained in:
Toke Stuart Jepsen 2023-04-07 10:46:02 +01:00
commit d06e8d3b07
99 changed files with 2034 additions and 1013 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -869,7 +869,6 @@
"dynamics": false,
"fluids": false,
"follicles": false,
"gpuCacheDisplayFilter": false,
"greasePencils": false,
"grid": false,
"hairSystems": true,
@ -896,7 +895,10 @@
"polymeshes": true,
"strokes": false,
"subdivSurfaces": false,
"textures": false
"textures": false,
"pluginObjects": {
"gpuCacheDisplayFilter": false
}
},
"Camera Options": {
"displayGateMask": false,
@ -930,6 +932,21 @@
},
"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": {

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

@ -363,6 +363,11 @@
"optional": true,
"active": true
},
"ValidateBackdrop": {
"enabled": true,
"optional": true,
"active": true
},
"ValidateScript": {
"enabled": true,
"optional": true,

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

@ -426,11 +426,6 @@
"key": "follicles",
"label": "Follicles"
},
{
"type": "boolean",
"key": "gpuCacheDisplayFilter",
"label": "GPU Cache"
},
{
"type": "boolean",
"key": "greasePencils",
@ -565,6 +560,12 @@
"type": "boolean",
"key": "textures",
"label": "Texture Placements"
},
{
"type": "dict-modifiable",
"key": "pluginObjects",
"label": "Plugin Objects",
"object_type": "boolean"
}
]
},

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

@ -1025,6 +1025,65 @@
}
}
]
},
{
"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"
}
]
}
]
}

10
openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json
View file

@ -62,7 +62,7 @@
"template_data": [
{
"key": "ValidateCorrectAssetName",
"label": "Validate Correct Asset name"
"label": "Validate Correct Asset Name"
}
]
},
@ -72,7 +72,7 @@
"template_data": [
{
"key": "ValidateContainers",
"label": "ValidateContainers"
"label": "Validate Containers"
}
]
},
@ -81,7 +81,7 @@
"collapsible": true,
"checkbox_key": "enabled",
"key": "ValidateKnobs",
"label": "ValidateKnobs",
"label": "Validate Knobs",
"is_group": true,
"children": [
{
@ -104,6 +104,10 @@
"key": "ValidateOutputResolution",
"label": "Validate Output Resolution"
},
{
"key": "ValidateBackdrop",
"label": "Validate Backdrop"
},
{
"key": "ValidateGizmo",
"label": "Validate Gizmo (Group)"