From faf668bcd70f478fe0125976cfbc86a92dcf850a Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 27 May 2021 19:19:04 +0200 Subject: [PATCH] tweak settings for nuke workfile build --- .../project_settings/aftereffects.json | 8 ++- .../defaults/project_settings/global.json | 3 +- .../defaults/project_settings/nuke.json | 48 +++------------ .../projects_schema/schema_project_nuke.json | 14 +---- ...ns.json => template_workfile_options.json} | 59 ++++++++----------- 5 files changed, 41 insertions(+), 91 deletions(-) rename openpype/settings/entities/schemas/projects_schema/schemas/{schema_workfile_options.json => template_workfile_options.json} (80%) diff --git a/openpype/settings/defaults/project_settings/aftereffects.json b/openpype/settings/defaults/project_settings/aftereffects.json index f54dbb9612..b272c60d98 100644 --- a/openpype/settings/defaults/project_settings/aftereffects.json +++ b/openpype/settings/defaults/project_settings/aftereffects.json @@ -4,8 +4,12 @@ "enabled": true, "optional": true, "active": true, - "skip_resolution_check": [".*"], - "skip_timelines_check": [".*"] + "skip_resolution_check": [ + ".*" + ], + "skip_timelines_check": [ + ".*" + ] }, "AfterEffectsSubmitDeadline": { "use_published": true, diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index d3b8c55d07..e3934bd537 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -272,8 +272,7 @@ "active_site": "studio", "remote_site": "studio" }, - "sites": { - } + "sites": {} }, "project_plugins": { "windows": [], diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index 33416e7b6c..a15c8f7838 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -6,9 +6,7 @@ "load": "ctrl+alt+l", "manage": "ctrl+alt+m", "build_workfile": "ctrl+alt+b" - }, - "open_workfile_at_start": false, - "create_initial_workfile": true + } }, "create": { "CreateWriteRender": { @@ -147,43 +145,15 @@ "node_name_template": "{class_name}_{ext}" } }, - "workfile_options": { - "create_first_version": { - "enabled": false, - "use_buildin_template": false, - "custom_template_paths": { - "windows": "", - "darwin": "", - "linux": "" - }, - "builder_on": false + "workfile_builder": { + "create_first_version": false, + "template_path": { + "windows": "", + "darwin": "", + "linux": "" }, - "builder_profiles": [ - { - "tasks": [ - "compositing" - ], - "current_context": [ - { - "subset_name_filters": [], - "families": [ - "render", - "plate" - ], - "repre_names": [ - "exr", - "dpx", - "mov" - ], - "loaders": [ - "LoadSequence", - "LoadMov" - ] - } - ], - "linked_assets": [] - } - ] + "builder_on_start": false, + "profiles": [] }, "filters": {} } \ No newline at end of file diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json b/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json index e77aa671be..f709e84651 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json @@ -43,16 +43,6 @@ "label": "Build Workfile" } ] - }, - { - "type": "boolean", - "key": "open_workfile_at_start", - "label": "Open Workfile window at start of a Nuke session" - }, - { - "type": "boolean", - "key": "create_initial_workfile", - "label": "Create initial workfile version if none available" } ] }, @@ -103,8 +93,8 @@ "template_data": [] }, { - "type": "schema", - "name": "schema_workfile_options" + "type": "schema_template", + "name": "template_workfile_options" }, { "type": "schema", diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_workfile_options.json b/openpype/settings/entities/schemas/projects_schema/schemas/template_workfile_options.json similarity index 80% rename from openpype/settings/entities/schemas/projects_schema/schemas/schema_workfile_options.json rename to openpype/settings/entities/schemas/projects_schema/schemas/template_workfile_options.json index 78b9ea6202..150f52113b 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_workfile_options.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/template_workfile_options.json @@ -1,50 +1,36 @@ -{ +[{ "type": "dict", "collapsible": true, - "key": "workfile_options", - "label": "Workfile Options", + "key": "workfile_builder", + "label": "Workfile Builder", "children": [ { - "type": "dict", - "collapsible": true, + "type": "boolean", "key": "create_first_version", - "label": "Create first version", - "checkbox_key": "enabled", - "children": [ - { - "type": "boolean", - "key": "enabled", - "label": "Enabled", - "default": false - }, - { - "type": "boolean", - "key": "use_buildin_template", - "label": "Use buildin template (if available)", - "default": false - }, - { - "type": "path", - "key": "custom_template_paths", - "label": "Custom template path", - "multiplatform": true, - "multipath": false - }, - { - "type": "boolean", - "key": "builder_on", - "label": "Use Builder profiles at start", - "default": false - } - ] + "label": "Create first workfile", + "default": false + }, + + { + "type": "path", + "key": "template_path", + "label": "First workfile Template", + "multiplatform": true, + "multipath": false + }, + { + "type": "boolean", + "key": "builder_on_start", + "label": "Run Builder Profiles on first launch", + "default": false }, { "type": "collapsible-wrap", - "label": "Builder Profiles", + "label": "Profiles", "children": [ { "type": "list", - "key": "builder_profiles", + "key": "profiles", "label": "Profiles", "object_type": { "type": "dict", @@ -138,3 +124,4 @@ } ] } +] \ No newline at end of file