From 67e75121fc50baf7cc28946d6bc5073f151561b7 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Wed, 16 Feb 2022 09:18:50 +0100 Subject: [PATCH] Deadline: set job/batch name to original source workfile name instead of published workfile --- .../deadline/plugins/publish/submit_maya_deadline.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 a87c0c374a..15a6f8d828 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 @@ -404,7 +404,13 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): dirname = os.path.join(workspace, default_render_file) renderlayer = instance.data['setMembers'] # rs_beauty deadline_user = context.data.get("user", getpass.getuser()) - jobname = "%s - %s" % (filename, instance.name) + + # Always use the original work file name for the Job name even when + # rendering is done from the published Work File. The original work + # file name is clearer because it can also have subversion strings, + # etc. which are stripped for the published file. + src_filename = os.path.basename(context.data["currentFile"]) + jobname = "%s - %s" % (src_filename, instance.name) # Get the variables depending on the renderer render_variables = get_renderer_variables(renderlayer, dirname) @@ -452,7 +458,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin): self.payload_skeleton["JobInfo"]["Plugin"] = self._instance.data.get( "mayaRenderPlugin", "MayaBatch") - self.payload_skeleton["JobInfo"]["BatchName"] = filename + self.payload_skeleton["JobInfo"]["BatchName"] = src_filename # Job name, as seen in Monitor self.payload_skeleton["JobInfo"]["Name"] = jobname # Arbitrary username, for visualisation in Monitor