From c22763fe04dc312a22622e739bbd78004e4a2873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20LORRAIN?= Date: Mon, 22 Nov 2021 11:54:40 +0100 Subject: [PATCH] Apply override on AOV layer path --- .../hosts/maya/plugins/publish/collect_render.py | 15 +++++++++++---- .../plugins/publish/submit_maya_deadline.py | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index 772afb6d212..79c7e850886 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -90,6 +90,9 @@ def process(self, context): return render_globals = render_instance + # Get global overrides and translate to Deadline values + overrides = self.parse_options(str(render_globals)) + collected_render_layers = render_instance.data["setMembers"] filepath = context.data["currentFile"].replace("\\", "/") asset = api.Session["AVALON_ASSET"] @@ -235,8 +238,14 @@ def process(self, context): for aov in exp_files: full_paths = [] for file in aov[aov.keys()[0]]: - full_path = os.path.join(workspace, default_render_file, - file) + if 'overrideOutput' in overrides: + full_path = os.path.join(overrides['overrideOutput'], + default_render_file, + file) + else: + full_path = os.path.join(workspace, + default_render_file, + file) full_path = full_path.replace("\\", "/") full_paths.append(full_path) publish_meta_path = os.path.dirname(full_path) @@ -380,8 +389,6 @@ def process(self, context): data["families"].append("assscene_render") # Include (optional) global settings - # Get global overrides and translate to Deadline values - overrides = self.parse_options(str(render_globals)) data.update(**overrides) # Define nice label diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/default_modules/deadline/plugins/publish/submit_maya_deadline.py index 5716f3b2001..2af15317ce0 100644 --- a/openpype/modules/default_modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/openpype/modules/default_modules/deadline/plugins/publish/submit_maya_deadline.py @@ -422,7 +422,8 @@ def process(self, instance): jobname = "%s - %s" % (filename, instance.name) # Get the variables depending on the renderer - render_variables = get_renderer_variables(renderlayer, dirname, override_output) + render_variables = get_renderer_variables(renderlayer, dirname, + override_output) filename_0 = render_variables["filename_0"] if self.use_published: new_scene = os.path.splitext(filename)[0]