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 feature/OP-5871_Max-Review-feature

Browse source
This commit is contained in:
Kayla Man 2023-05-26 13:00:22 +08:00
commit 17040ba519
99 changed files with 3955 additions and 1365 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,15 @@
"chunk_size": 10,
"group": "none"
},
"FusionSubmitDeadline": {
"enabled": true,
"optional": false,
"active": true,
"priority": 50,
"chunk_size": 10,
"concurrent_tasks": 1,
"group": ""
},
"NukeSubmitDeadline": {
"enabled": true,
"optional": false,
@ -114,6 +123,9 @@
],
"max": [
".*"
],
"fusion": [
".*"
]
}
}

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

@ -358,12 +358,12 @@
"optional": true,
"active": true
},
"ValidateGizmo": {
"ValidateBackdrop": {
"enabled": true,
"optional": true,
"active": true
},
"ValidateBackdrop": {
"ValidateGizmo": {
"enabled": true,
"optional": true,
"active": true
@ -401,7 +401,39 @@
false
]
]
}
},
"reposition_nodes": [
{
"node_class": "Reformat",
"knobs": [
{
"type": "text",
"name": "type",
"value": "to format"
},
{
"type": "text",
"name": "format",
"value": "HD_1080"
},
{
"type": "text",
"name": "filter",
"value": "Lanczos6"
},
{
"type": "bool",
"name": "black_outside",
"value": true
},
{
"type": "bool",
"name": "pbb",
"value": false
}
]
}
]
},
"ExtractReviewData": {
"enabled": false

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

@ -1069,8 +1069,8 @@
"RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR": [],
"RESOLVE_PYTHON3_HOME": {
"windows": "{LOCALAPPDATA}/Programs/Python/Python36",
"darwin": "~/Library/Python/3.6/bin",
"linux": "/opt/Python/3.6/bin"
"darwin": "/Library/Frameworks/Python.framework/Versions/3.6",
"linux": "/opt/Python/3.6"
}
},
"variants": {

5
openpype/settings/entities/lib.py
View file

@ -323,7 +323,10 @@ class SchemasHub:
filled_template = self._fill_template(
schema_data, template_def
)
return filled_template
new_template_def = []
for item in filled_template:
new_template_def.extend(self.resolve_schema_data(item))
return new_template_def
def create_schema_object(self, schema_data, *args, **kwargs):
"""Create entity for passed schema data.

44
openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
View file

@ -248,6 +248,50 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "FusionSubmitDeadline",
"label": "Fusion submit to Deadline",
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "boolean",
"key": "optional",
"label": "Optional"
},
{
"type": "boolean",
"key": "active",
"label": "Active"
},
{
"type": "number",
"key": "priority",
"label": "Priority"
},
{
"type": "number",
"key": "chunk_size",
"label": "Frame per Task"
},
{
"type": "number",
"key": "concurrent_tasks",
"label": "Number of concurrent tasks"
},
{
"type": "text",
"key": "group",
"label": "Group Name"
}
]
},
{
"type": "dict",
"collapsible": true,

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

@ -158,10 +158,43 @@
"label": "Nodes",
"collapsible": true,
"children": [
{
"type": "label",
"label": "Nodes attribute will be deprecated in future releases. Use reposition_nodes instead."
},
{
"type": "raw-json",
"key": "nodes",
"label": "Nodes"
"label": "Nodes [depricated]"
},
{
"type": "label",
"label": "Reposition knobs supported only. You can add multiple reformat nodes <br/>and set their knobs. Order of reformat nodes is important. First reformat node <br/>will be applied first and last reformat node will be applied last."
},
{
"key": "reposition_nodes",
"type": "list",
"label": "Reposition nodes",
"object_type": {
"type": "dict",
"children": [
{
"key": "node_class",
"label": "Node class",
"type": "text"
},
{
"type": "schema_template",
"name": "template_nuke_knob_inputs",
"template_data": [
{
"label": "Node knobs",
"key": "knobs"
}
]
}
]
}
}
]
}