move the pool settings into the pool collectors

This commit is contained in:
Kayla Man 2023-03-21 15:55:07 +08:00
parent c48fddbba3
commit d8441216e4
2 changed files with 4 additions and 8 deletions

View file

@ -28,12 +28,6 @@ class CollectDeadlinePools(pyblish.api.InstancePlugin,
settings = project_settings["deadline"]["publish"]["CollectDeadlinePools"] # noqa
cls.primary_pool = settings.get("primary_pool", None)
cls.secondary_pool = settings.get("secondary_pool", None)
for family in cls.families:
if family == "maxrender":
max_setting = project_settings["deadline"]["publish"]["MaxSubmitDeadline"] # noqa
cls.primary_pool = max_setting.get("deadline_pool", None)
cls.secondary_pool = max_setting.get("deadline_pool_secondary",
None)
def process(self, instance):

View file

@ -91,8 +91,10 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
)
job_info.Frames = frames
job_info.Pool = instance.data.get("primaryPool")
job_info.SecondaryPool = instance.data.get("secondaryPool")
job_info.Pool = instance.data.get("primaryPool",
self.deadline_pool)
job_info.SecondaryPool = instance.data.get("secondaryPool",
self.deadline_pool_secondary)
attr_values = self.get_attr_values_from_data(instance.data)