mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-25 13:24:54 +01:00
fix bug with aov_filter
This commit is contained in:
parent
74fe21a2b3
commit
effedd82c8
2 changed files with 11 additions and 7 deletions
|
|
@ -25,8 +25,9 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin):
|
|||
hosts = ["houdini"]
|
||||
label = "Collect local render instances"
|
||||
|
||||
override_deadline_aov_filter = False
|
||||
aov_filter = {}
|
||||
use_deadline_aov_filter = False
|
||||
aov_filter = {"host_name": "houdini",
|
||||
"value": [".*([Bb]eauty).*"]}
|
||||
|
||||
@classmethod
|
||||
def apply_settings(cls, project_settings):
|
||||
|
|
@ -37,11 +38,11 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin):
|
|||
category="houdini")
|
||||
apply_plugin_settings_automatically(cls, settings, logger=cls.log)
|
||||
|
||||
if not cls.override_deadline_aov_filter:
|
||||
if not cls.use_deadline_aov_filter:
|
||||
# get aov_filter from collector settings
|
||||
# and restructure it as match_aov_pattern requires.
|
||||
cls.aov_filter = {
|
||||
"houdini": cls.aov_filter["value"]
|
||||
cls.aov_filter["host_name"]: cls.aov_filter["value"]
|
||||
}
|
||||
else:
|
||||
# get aov_filter from deadline settings
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ class CollectChunkSizeModel(BaseSettingsModel):
|
|||
|
||||
|
||||
class AOVFilterSubmodel(BaseSettingsModel):
|
||||
"""You should use the same host name you are using for Houdini."""
|
||||
host_name: str = SettingsField("", title="Houdini Host name")
|
||||
value: list[str] = SettingsField(
|
||||
default_factory=list,
|
||||
title="AOV regex"
|
||||
|
|
@ -31,9 +33,9 @@ class AOVFilterSubmodel(BaseSettingsModel):
|
|||
|
||||
class CollectLocalRenderInstancesModel(BaseSettingsModel):
|
||||
|
||||
override_deadline_aov_filter: bool = SettingsField(
|
||||
use_deadline_aov_filter: bool = SettingsField(
|
||||
False,
|
||||
title="Override Deadline AOV Filter"
|
||||
title="Use Deadline AOV Filter"
|
||||
)
|
||||
|
||||
aov_filter: AOVFilterSubmodel = SettingsField(
|
||||
|
|
@ -109,8 +111,9 @@ DEFAULT_HOUDINI_PUBLISH_SETTINGS = {
|
|||
"chunk_size": 999999
|
||||
},
|
||||
"CollectLocalRenderInstances": {
|
||||
"override_deadline_aov_filter": False,
|
||||
"use_deadline_aov_filter": False,
|
||||
"aov_filter" : {
|
||||
"host_name": "houdini",
|
||||
"value": [
|
||||
".*([Bb]eauty).*"
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue