diff --git a/openpype/hosts/celaction/hooks/pre_celaction_setup.py b/openpype/hosts/celaction/hooks/pre_celaction_setup.py index 7506f1a52c..81f5f2bf11 100644 --- a/openpype/hosts/celaction/hooks/pre_celaction_setup.py +++ b/openpype/hosts/celaction/hooks/pre_celaction_setup.py @@ -56,8 +56,20 @@ class CelactionPrelaunchHook(PreLaunchHook): ] # Add custom parameters from workfile settings - if workfile_settings["parameters"]: - parameters += workfile_settings["parameters"] + if "render_chunk" in workfile_settings["submission_overrides"]: + parameters += [ + "--chunk *CHUNK*" + ] + elif "resolution" in workfile_settings["submission_overrides"]: + parameters += [ + "--resolutionWidth *X*", + "--resolutionHeight *Y*" + ] + elif "frame_range" in workfile_settings["submission_overrides"]: + parameters += [ + "--frameStart *START*", + "--frameEnd *END*" + ] winreg.SetValueEx( hKey, "SubmitParametersTitle", 0, winreg.REG_SZ, diff --git a/openpype/settings/defaults/project_settings/celaction.json b/openpype/settings/defaults/project_settings/celaction.json index 0194b2c48c..822604fd2f 100644 --- a/openpype/settings/defaults/project_settings/celaction.json +++ b/openpype/settings/defaults/project_settings/celaction.json @@ -10,12 +10,10 @@ } }, "workfile": { - "parameters": [ - "--chunk *CHUNK*", - "--frameStart *START*", - "--frameEnd *END*", - "--resolutionWidth *X*", - "--resolutionHeight *Y*" + "submission_overrides": [ + "render_chunk", + "frame_range", + "resolution" ] }, "publish": { diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_celaction.json b/openpype/settings/entities/schemas/projects_schema/schema_project_celaction.json index 4ca3cbb4da..c5ca3eb9f5 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_celaction.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_celaction.json @@ -29,10 +29,21 @@ "label": "Workfile", "children": [ { - "key": "parameters", - "label": "Parameters", - "type": "list", - "object_type": "text" + "key": "submission_overrides", + "label": "Submission workfile overrides", + "type": "enum", + "multiselection": true, + "enum_items": [ + { + "render_chunk": "Pass chunk size" + }, + { + "frame_range": "Pass frame range" + }, + { + "resolution": "Pass resolution" + } + ] } ] },