From e3ba7e9c15ee9f1e361390683db2bc877178b7c4 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 17 Sep 2021 12:53:08 +0200 Subject: [PATCH 1/3] Removal of unwanted change --- .../defaults/project_settings/nuke.json | 10 ++++++ .../schemas/schema_nuke_publish.json | 32 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index 136f1d6b427..c1c3e77684f 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -96,6 +96,16 @@ }, "ExtractSlateFrame": { "viewer_lut_raw": false + }, + "IncrementScriptVersion": { + "optional": true, + "active": true, + "families": [ + "workfile", + "render", + "render.local", + "render.farm" + ] } }, "load": { diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json index 782179cfd1a..d354ff15f85 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json @@ -152,6 +152,38 @@ "label": "Viewer LUT raw" } ] + }, + { + "type": "splitter" + }, + { + "type": "label", + "label": "Integrators" + }, + { + "type": "dict", + "collapsible": false, + "key": "IncrementScriptVersion", + "label": "IncrementScriptVersion", + "is_group": true, + "children": [ + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "type": "boolean", + "key": "active", + "label": "Active" + }, + { + "type": "list", + "key": "families", + "object_type": "text", + "label": "Trigger on families" + } + ] } ] } From e86675a5afa388b5f156019ff783e7ff6bb68180 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 20 Sep 2021 10:32:36 +0200 Subject: [PATCH 2/3] Removed unwanted configuration of families Plugin should run only when publishing workfile, configuration of families doesn't make sense. --- .../nuke/plugins/publish/increment_script_version.py | 2 +- openpype/settings/defaults/project_settings/nuke.json | 8 +------- .../projects_schema/schemas/schema_nuke_publish.json | 6 ------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/openpype/hosts/nuke/plugins/publish/increment_script_version.py b/openpype/hosts/nuke/plugins/publish/increment_script_version.py index 47fccb91257..f55ed21ee2e 100644 --- a/openpype/hosts/nuke/plugins/publish/increment_script_version.py +++ b/openpype/hosts/nuke/plugins/publish/increment_script_version.py @@ -9,7 +9,7 @@ class IncrementScriptVersion(pyblish.api.ContextPlugin): order = pyblish.api.IntegratorOrder + 0.9 label = "Increment Script Version" optional = True - families = ["workfile", "render", "render.local", "render.farm"] + families = ["workfile"] hosts = ['nuke'] def process(self, context): diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index c1c3e77684f..467849cc36f 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -99,13 +99,7 @@ }, "IncrementScriptVersion": { "optional": true, - "active": true, - "families": [ - "workfile", - "render", - "render.local", - "render.farm" - ] + "active": true } }, "load": { diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json index d354ff15f85..df5015b551b 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json @@ -176,12 +176,6 @@ "type": "boolean", "key": "active", "label": "Active" - }, - { - "type": "list", - "key": "families", - "object_type": "text", - "label": "Trigger on families" } ] } From 2506d0f0d6e4e7a419f078f2b2b644a8f1a31627 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 20 Sep 2021 17:44:02 +0200 Subject: [PATCH 3/3] Changed setting schema to include enabled pill --- openpype/settings/defaults/project_settings/nuke.json | 1 + .../projects_schema/schemas/schema_nuke_publish.json | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index 467849cc36f..fb10d30f67f 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -98,6 +98,7 @@ "viewer_lut_raw": false }, "IncrementScriptVersion": { + "enabled": true, "optional": true, "active": true } diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json index df5015b551b..f385f6149f4 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json @@ -162,11 +162,17 @@ }, { "type": "dict", - "collapsible": false, + "collapsible": true, + "checkbox_key": "enabled", "key": "IncrementScriptVersion", "label": "IncrementScriptVersion", "is_group": true, "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, { "type": "boolean", "key": "optional",