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/api/lib.py
This commit is contained in:
Toke Stuart Jepsen 2023-04-13 11:40:02 +01:00
commit 4f79d7fab2
77 changed files with 1581 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -251,15 +251,16 @@
}
},
{
"families": [],
"families": ["review"],
"hosts": [
"maya"
"maya",
"houdini"
],
"task_types": [],
"task_names": [],
"subsets": [],
"burnins": {
"maya_burnin": {
"focal_length_burnin": {
"TOP_LEFT": "{yy}-{mm}-{dd}",
"TOP_CENTERED": "{focalLength:.2f} mm",
"TOP_RIGHT": "{anatomy[version]}",

3
openpype/settings/defaults/project_settings/hiero.json
View file

@ -21,7 +21,8 @@
"floatLut": "linear",
"logLut": "Cineon",
"viewerLut": "sRGB",
"thumbnailLut": "sRGB"
"thumbnailLut": "sRGB",
"monitorOutLut": "sRGB"
},
"regexInputs": {
"inputs": [

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

@ -1048,6 +1048,10 @@
125,
255
]
},
"reference_loader": {
"namespace": "{asset_name}_{subset}_##",
"group_name": "_GRP"
}
},
"workfile_build": {
@ -1141,6 +1145,10 @@
}
]
},
"include_handles": {
"include_handles_default": false,
"per_task_type": []
},
"templated_workfile_build": {
"profiles": []
},

44
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,
@ -537,45 +542,10 @@
"create_first_version": false,
"custom_templates": [],
"builder_on_start": false,
"profiles": [
{
"task_types": [],
"tasks": [],
"current_context": [
{
"subset_name_filters": [],
"families": [
"render",
"plate"
],
"repre_names": [
"exr",
"dpx",
"mov",
"mp4",
"h264"
],
"loaders": [
"LoadClip"
]
}
],
"linked_assets": []
}
]
"profiles": []
},
"templated_workfile_build": {
"profiles": [
{
"task_types": [
"Compositing"
],
"task_names": [],
"path": "{project[name]}/templates/comp.nk",
"keep_placeholder": true,
"create_first_version": true
}
]
"profiles": []
},
"filters": {}
}

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

@ -133,7 +133,9 @@
"linux": []
},
"arguments": {
"windows": ["-U MAXScript {OPENPYPE_ROOT}\\openpype\\hosts\\max\\startup\\startup.ms"],
"windows": [
"-U MAXScript {OPENPYPE_ROOT}\\openpype\\hosts\\max\\startup\\startup.ms"
],
"darwin": [],
"linux": []
},
@ -361,9 +363,15 @@
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
"windows": [
"--nukeassist"
],
"darwin": [
"--nukeassist"
],
"linux": [
"--nukeassist"
]
},
"environment": {}
},
@ -379,9 +387,15 @@
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
"windows": [
"--nukeassist"
],
"darwin": [
"--nukeassist"
],
"linux": [
"--nukeassist"
]
},
"environment": {}
},
@ -397,9 +411,15 @@
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
"windows": [
"--nukeassist"
],
"darwin": [
"--nukeassist"
],
"linux": [
"--nukeassist"
]
},
"environment": {}
},
@ -415,9 +435,15 @@
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
"windows": [
"--nukeassist"
],
"darwin": [
"--nukeassist"
],
"linux": [
"--nukeassist"
]
},
"environment": {}
},
@ -433,9 +459,15 @@
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
"windows": [
"--nukeassist"
],
"darwin": [
"--nukeassist"
],
"linux": [
"--nukeassist"
]
},
"environment": {}
},
@ -449,9 +481,15 @@
"linux": []
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
"windows": [
"--nukeassist"
],
"darwin": [
"--nukeassist"
],
"linux": [
"--nukeassist"
]
},
"environment": {}
},
@ -1450,21 +1488,45 @@
"label": "Unreal Editor",
"icon": "{}/app_icons/ue4.png",
"host_name": "unreal",
"environment": {},
"environment": {
"UE_PYTHONPATH": "{PYTHONPATH}"
},
"variants": {
"4-27": {
"use_python_2": false,
"environment": {}
},
"5-0": {
"use_python_2": false,
"environment": {
"UE_PYTHONPATH": "{PYTHONPATH}"
}
"executables": {
"windows": [
"C:\\Program Files\\Epic Games\\UE_5.0\\Engine\\Binaries\\Win64\\UnrealEditor.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
},
"5-1": {
"use_python_2": false,
"executables": {
"windows": [
"C:\\Program Files\\Epic Games\\UE_5.1\\Engine\\Binaries\\Win64\\UnrealEditor.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
},
"__dynamic_keys_labels__": {
"4-27": "4.27",
"5-0": "5.0"
"5-1": "Unreal 5.1",
"5-0": "Unreal 5.0"
}
}
},

2
openpype/settings/entities/input_entities.py
View file

@ -450,6 +450,8 @@ class TextEntity(InputEntity):
self.multiline = self.schema_data.get("multiline", False)
self.placeholder_text = self.schema_data.get("placeholder")
self.value_hints = self.schema_data.get("value_hints") or []
self.minimum_lines_count = (
self.schema_data.get("minimum_lines_count") or 0)
def schema_validations(self):
if self.multiline and self.value_hints:

1
openpype/settings/entities/schemas/README.md
View file

@ -380,6 +380,7 @@ How output of the schema could look like on save:
- simple text input
- key `"multiline"` allows to enter multiple lines of text (Default: `False`)
- key `"placeholder"` allows to show text inside input when is empty (Default: `None`)
- key `"minimum_lines_count"` allows to define minimum size hint for UI. Can be 0-n lines.
```
{

18
openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
View file

@ -42,10 +42,19 @@
"nuke-default": "nuke-default"
},
{
"aces_1.0.3": "aces_1.0.3"
"aces_1.0.3": "aces_1.0.3 (12)"
},
{
"aces_1.1": "aces_1.1"
"aces_1.1": "aces_1.1 (12, 13)"
},
{
"aces_1.2": "aces_1.2 (13, 14)"
},
{
"studio-config-v1.0.0_aces-v1.3_ocio-v2.1": "studio-config-v1.0.0_aces-v1.3_ocio-v2.1 (14)"
},
{
"cg-config-v1.0.0_aces-v1.3_ocio-v2.1": "cg-config-v1.0.0_aces-v1.3_ocio-v2.1 (14)"
},
{
"custom": "custom"
@ -93,6 +102,11 @@
"type": "text",
"key": "thumbnailLut",
"label": "Thumbnails"
},
{
"type": "text",
"key": "monitorOutLut",
"label": "Monitor"
}
]
}

34
openpype/settings/entities/schemas/projects_schema/schema_project_maya.json
View file

@ -151,6 +151,40 @@
}
]
},
{
"type": "dict",
"key": "include_handles",
"collapsible": true,
"label": "Include/Exclude Handles in default playback & render range",
"children": [
{
"key": "include_handles_default",
"label": "Include handles by default",
"type": "boolean"
},
{
"type": "list",
"key": "per_task_type",
"label": "Include/exclude handles by task type",
"use_label_wrap": true,
"object_type": {
"type": "dict",
"children": [
{
"type": "task-types-enum",
"key": "task_type",
"label": "Task types"
},
{
"type": "boolean",
"key": "include_handles",
"label": "Include handles"
}
]
}
}
]
},
{
"type": "schema",
"name": "schema_scriptsmenu"

22
openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_load.json
View file

@ -91,6 +91,28 @@
"key": "yetiRig"
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "reference_loader",
"label": "Reference Loader",
"children": [
{
"type": "text",
"label": "Namespace",
"key": "namespace"
},
{
"type": "text",
"label": "Group name",
"key": "group_name"
},
{
"type": "label",
"label": "Here's a link to the doc where you can find explanations about customing the naming of referenced assets: https://openpype.io/docs/admin_hosts_maya#load-plugins"
}
]
}
]
}

24
openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_imageio.json
View file

@ -74,28 +74,34 @@
"nuke-default": "nuke-default"
},
{
"spi-vfx": "spi-vfx"
"spi-vfx": "spi-vfx (11)"
},
{
"spi-anim": "spi-anim"
"spi-anim": "spi-anim (11)"
},
{
"aces_0.1.1": "aces_0.1.1"
"aces_0.1.1": "aces_0.1.1 (11)"
},
{
"aces_0.7.1": "aces_0.7.1"
"aces_0.7.1": "aces_0.7.1 (11)"
},
{
"aces_1.0.1": "aces_1.0.1"
"aces_1.0.1": "aces_1.0.1 (11)"
},
{
"aces_1.0.3": "aces_1.0.3"
"aces_1.0.3": "aces_1.0.3 (11, 12)"
},
{
"aces_1.1": "aces_1.1"
"aces_1.1": "aces_1.1 (12, 13)"
},
{
"aces_1.2": "aces_1.2"
"aces_1.2": "aces_1.2 (13, 14)"
},
{
"studio-config-v1.0.0_aces-v1.3_ocio-v2.1": "studio-config-v1.0.0_aces-v1.3_ocio-v2.1 (14)"
},
{
"cg-config-v1.0.0_aces-v1.3_ocio-v2.1": "cg-config-v1.0.0_aces-v1.3_ocio-v2.1 (14)"
},
{
"custom": "custom"
@ -257,4 +263,4 @@
]
}
]
}
}

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)"

7
openpype/settings/entities/schemas/system_schema/host_settings/schema_unreal.json
View file

@ -30,12 +30,7 @@
"children": [
{
"type": "schema_template",
"name": "template_host_variant_items",
"skip_paths": [
"executables",
"separator",
"arguments"
]
"name": "template_host_variant_items"
}
]
}