Merge branch 'develop' into bugfix/OP-4932_Nuke-chunk-size-is-not-propagated-from-DL-setting-to-Nuke-Publisher

This commit is contained in:
Jakub Ježek 2023-02-23 17:14:48 +01:00 committed by GitHub
commit 36df45a640
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 1364 additions and 127 deletions

View file

@ -68,6 +68,10 @@
"output": []
}
},
"ExtractOIIOTranscode": {
"enabled": true,
"profiles": []
},
"ExtractReview": {
"enabled": true,
"profiles": [

View file

@ -407,6 +407,16 @@
"optional": false,
"active": true
},
"ValidateGLSLMaterial": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateGLSLPlugin": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateRenderImageRule": {
"enabled": true,
"optional": false,
@ -898,6 +908,11 @@
"optional": true,
"active": true,
"bake_attributes": []
},
"ExtractGLB": {
"enabled": true,
"active": true,
"ogsfx_path": "/maya2glTF/PBR/shaders/glTF_PBR.ogsfx"
}
},
"load": {

View file

@ -446,6 +446,41 @@
"value": false
}
],
"reformat_nodes_config": {
"enabled": 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
}
]
}
]
},
"extension": "mov",
"add_custom_tags": []
}

View file

@ -337,6 +337,134 @@
}
}
},
"nukeassist": {
"enabled": true,
"label": "Nuke Assist",
"icon": "{}/app_icons/nuke.png",
"host_name": "nuke",
"environment": {
"NUKE_PATH": [
"{NUKE_PATH}",
"{OPENPYPE_STUDIO_PLUGINS}/nuke"
]
},
"variants": {
"13-2": {
"use_python_2": false,
"executables": {
"windows": [
"C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe"
],
"darwin": [],
"linux": [
"/usr/local/Nuke13.2v1/Nuke13.2"
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
},
"environment": {}
},
"13-0": {
"use_python_2": false,
"executables": {
"windows": [
"C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe"
],
"darwin": [],
"linux": [
"/usr/local/Nuke13.0v1/Nuke13.0"
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
},
"environment": {}
},
"12-2": {
"use_python_2": true,
"executables": {
"windows": [
"C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe"
],
"darwin": [],
"linux": [
"/usr/local/Nuke12.2v3Nuke12.2"
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
},
"environment": {}
},
"12-0": {
"use_python_2": true,
"executables": {
"windows": [
"C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe"
],
"darwin": [],
"linux": [
"/usr/local/Nuke12.0v1/Nuke12.0"
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
},
"environment": {}
},
"11-3": {
"use_python_2": true,
"executables": {
"windows": [
"C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe"
],
"darwin": [],
"linux": [
"/usr/local/Nuke11.3v5/Nuke11.3"
]
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
},
"environment": {}
},
"11-2": {
"use_python_2": true,
"executables": {
"windows": [
"C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": ["--nukeassist"],
"darwin": ["--nukeassist"],
"linux": ["--nukeassist"]
},
"environment": {}
},
"__dynamic_keys_labels__": {
"13-2": "13.2",
"13-0": "13.0",
"12-2": "12.2",
"12-0": "12.0",
"11-3": "11.3",
"11-2": "11.2"
}
}
},
"nukex": {
"enabled": true,
"label": "Nuke X",

View file

@ -197,6 +197,136 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "ExtractOIIOTranscode",
"label": "Extract OIIO Transcode",
"checkbox_key": "enabled",
"is_group": true,
"children": [
{
"type": "label",
"label": "Configure Output Definition(s) for new representation(s). \nEmpty 'Extension' denotes keeping source extension. \nName(key) of output definition will be used as new representation name \nunless 'passthrough' value is used to keep existing name. \nFill either 'Colorspace' (for target colorspace) or \nboth 'Display' and 'View' (for display and viewer colorspaces)."
},
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "list",
"key": "profiles",
"label": "Profiles",
"object_type": {
"type": "dict",
"children": [
{
"key": "families",
"label": "Families",
"type": "list",
"object_type": "text"
},
{
"key": "hosts",
"label": "Host names",
"type": "hosts-enum",
"multiselection": true
},
{
"key": "task_types",
"label": "Task types",
"type": "task-types-enum"
},
{
"key": "task_names",
"label": "Task names",
"type": "list",
"object_type": "text"
},
{
"key": "subsets",
"label": "Subset names",
"type": "list",
"object_type": "text"
},
{
"type": "boolean",
"key": "delete_original",
"label": "Delete Original Representation"
},
{
"type": "splitter"
},
{
"key": "outputs",
"label": "Output Definitions",
"type": "dict-modifiable",
"highlight_content": true,
"object_type": {
"type": "dict",
"children": [
{
"key": "extension",
"label": "Extension",
"type": "text"
},
{
"type": "enum",
"key": "transcoding_type",
"label": "Transcoding type",
"enum_items": [
{ "colorspace": "Use Colorspace" },
{ "display": "Use Display&View" }
]
},
{
"key": "colorspace",
"label": "Colorspace",
"type": "text"
},
{
"key": "display",
"label": "Display",
"type": "text"
},
{
"key": "view",
"label": "View",
"type": "text"
},
{
"key": "oiiotool_args",
"label": "OIIOtool arguments",
"type": "dict",
"highlight_content": true,
"children": [
{
"key": "additional_command_args",
"label": "Arguments",
"type": "list",
"object_type": "text"
}
]
},
{
"type": "schema",
"name": "schema_representation_tags"
},
{
"key": "custom_tags",
"label": "Custom Tags",
"type": "list",
"object_type": "text"
}
]
}
}
]
}
}
]
},
{
"type": "dict",
"collapsible": true,

View file

@ -408,6 +408,14 @@
"key": "ValidateCurrentRenderLayerIsRenderable",
"label": "Validate Current Render Layer Has Renderable Camera"
},
{
"key": "ValidateGLSLMaterial",
"label": "Validate GLSL Material"
},
{
"key": "ValidateGLSLPlugin",
"label": "Validate GLSL Plugin"
},
{
"key": "ValidateRenderImageRule",
"label": "Validate Images File Rule (Workspace)"
@ -956,6 +964,30 @@
"is_list": true
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "ExtractGLB",
"label": "Extract GLB",
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "boolean",
"key": "active",
"label": "Active"
},
{
"type": "text",
"key": "ogsfx_path",
"label": "GLSL Shader Directory"
}
]
}
]
}

View file

@ -271,6 +271,10 @@
{
"type": "separator"
},
{
"type": "label",
"label": "Currently we are supporting also multiple reposition nodes. <br/>Older single reformat node is still supported <br/>and if it is activated then preference will <br/>be on it. If you want to use multiple reformat <br/>nodes then you need to disable single reformat <br/>node and enable multiple <b>Reformat nodes</b> <a href=\"settings://project_settings/nuke/publish/ExtractReviewDataMov/outputs/baking/reformat_nodes_config/enabled\"><b>here</b></a>."
},
{
"type": "boolean",
"key": "reformat_node_add",
@ -287,6 +291,49 @@
}
]
},
{
"key": "reformat_nodes_config",
"type": "dict",
"label": "Reformat Nodes",
"collapsible": true,
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "label",
"label": "Reposition knobs supported only.<br/>You can add multiple reformat nodes <br/>and set their knobs. Order of reformat <br/>nodes is important. First reformat node <br/>will be applied first and last reformat <br/>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"
}
]
}
]
}
}
]
},
{
"type": "separator"
},

View file

@ -25,6 +25,14 @@
"nuke_label": "Nuke"
}
},
{
"type": "schema_template",
"name": "template_nuke",
"template_data": {
"nuke_type": "nukeassist",
"nuke_label": "Nuke Assist"
}
},
{
"type": "schema_template",
"name": "template_nuke",