diff --git a/openpype/hosts/maya/plugins/create/create_render.py b/openpype/hosts/maya/plugins/create/create_render.py index 46811758086..bb15ecb3108 100644 --- a/openpype/hosts/maya/plugins/create/create_render.py +++ b/openpype/hosts/maya/plugins/create/create_render.py @@ -224,6 +224,12 @@ def _create_render_settings(self): self.data["priority"] = default_priority self.data["tile_priority"] = default_priority self.data["framesPerTask"] = 1 + self.data["machineLimit"] = self._project_settings.get( + "deadline").get( + "publish").get( + "MayaSubmitDeadline").get( + "jobInfo").get( + "machineLimit", 0) self.data["whitelist"] = False self.data["machineList"] = "" self.data["useMayaBatch"] = False diff --git a/openpype/hosts/maya/plugins/publish/collect_render.py b/openpype/hosts/maya/plugins/publish/collect_render.py index babd494758f..90d64ef2dd4 100644 --- a/openpype/hosts/maya/plugins/publish/collect_render.py +++ b/openpype/hosts/maya/plugins/publish/collect_render.py @@ -310,12 +310,13 @@ def process(self, context): "pixelAspect": lib.get_attr_in_layer( "defaultResolution.pixelAspect", layer=layer_name ), - "tileRendering": render_instance.data.get("tileRendering") or False, # noqa: E501 - "tilesX": render_instance.data.get("tilesX") or 2, - "tilesY": render_instance.data.get("tilesY") or 2, + "tileRendering": render_instance.data.get("tileRendering", False), # noqa: E501 + "tilesX": render_instance.data.get("tilesX", 2), + "tilesY": render_instance.data.get("tilesY", 2), "priority": render_instance.data.get("priority"), + "machineLimit": render_instance.data.get("machineLimit", 0), "convertToScanline": render_instance.data.get( - "convertToScanline") or False, + "convertToScanline", False), "useReferencedAovs": render_instance.data.get( "useReferencedAovs") or render_instance.data.get( "vrayUseReferencedAovs") or False, @@ -399,6 +400,9 @@ def parse_options(self, render_globals): if pool_b: options["renderGlobals"].update({"SecondaryPool": pool_b}) + # Number of workers for the current job + options["machineLimit"] = attributes["machineLimit"] + # Machine list machine_list = attributes["machineList"] if machine_list: diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py index a6cdcb7e711..ecff58eed74 100644 --- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -144,6 +144,7 @@ def get_job_info(self): job_info.SecondaryPool = instance.data.get("secondaryPool") job_info.Comment = context.data.get("comment") job_info.Priority = instance.data.get("priority", self.priority) + job_info.MachineLimit = instance.data.get("machineLimit", 0) if self.group != "none" and self.group: job_info.Group = self.group