Merge branch 'develop' into feature/OP-5871_Max-Review-feature

This commit is contained in:
Kayla Man 2023-06-08 17:29:44 +08:00
commit e295b19149
110 changed files with 3842 additions and 934 deletions

View file

@ -1,4 +1,9 @@
{
"unit_scale_settings": {
"enabled": true,
"apply_on_opening": false,
"base_file_unit_scale": 0.01
},
"imageio": {
"ocio_config": {
"enabled": false,

View file

@ -46,6 +46,10 @@
"enabled": false,
"families": []
},
"CollectFramesFixDef": {
"enabled": true,
"rewrite_version_enable": true
},
"ValidateEditorialAssetName": {
"enabled": true,
"optional": false
@ -252,7 +256,9 @@
}
},
{
"families": ["review"],
"families": [
"review"
],
"hosts": [
"maya",
"houdini",

View file

@ -222,6 +222,20 @@
"title": "OpenPype Docs",
"command": "import webbrowser;webbrowser.open(url='https://openpype.io/docs/artist_hosts_nuke_tut')",
"tooltip": "Open the OpenPype Nuke user doc page"
},
{
"type": "action",
"sourcetype": "python",
"title": "Set Frame Start (Read Node)",
"command": "from openpype.hosts.nuke.startup.frame_setting_for_read_nodes import main;main();",
"tooltip": "Set frame start for read node(s)"
},
{
"type": "action",
"sourcetype": "python",
"title": "Set non publish output for Write Node",
"command": "from openpype.hosts.nuke.startup.custom_write_node import main;main();",
"tooltip": "Open the OpenPype Nuke user doc page"
}
]
},

View file

@ -1,4 +1,5 @@
{
"launch_openpype_menu_on_start": false,
"imageio": {
"ocio_config": {
"enabled": false,

View file

@ -15,6 +15,6 @@
"preroll_frames": 0,
"render_format": "png",
"project_setup": {
"dev_mode": true
"dev_mode": false
}
}

View file

@ -5,6 +5,32 @@
"label": "Blender",
"is_file": true,
"children": [
{
"key": "unit_scale_settings",
"type": "dict",
"label": "Set Unit Scale",
"collapsible": true,
"is_group": true,
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"key": "apply_on_opening",
"type": "boolean",
"label": "Apply on Opening Existing Files"
},
{
"key": "base_file_unit_scale",
"type": "number",
"label": "Base File Unit Scale",
"decimal": 10
}
]
},
{
"key": "imageio",
"type": "dict",

View file

@ -5,6 +5,11 @@
"label": "DaVinci Resolve",
"is_file": true,
"children": [
{
"type": "boolean",
"key": "launch_openpype_menu_on_start",
"label": "Launch OpenPype menu on start of Resolve"
},
{
"key": "imageio",
"type": "dict",

View file

@ -81,6 +81,26 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"checkbox_key": "enabled",
"key": "CollectFramesFixDef",
"label": "Collect Frames to Fix",
"is_group": true,
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "boolean",
"key": "rewrite_version_enable",
"label": "Show 'Rewrite latest version' toggle"
}
]
},
{
"type": "dict",
"collapsible": true,