mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 21:04:40 +01:00
max 'ValidateLoadedPlugin' can use AYON settings
This commit is contained in:
parent
96cbbeb823
commit
d8c8f7f0ec
3 changed files with 12 additions and 14 deletions
|
|
@ -25,7 +25,7 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
|
|||
optional = True
|
||||
actions = [RepairAction]
|
||||
|
||||
family_plugins_mapping = {}
|
||||
family_plugins_mapping = []
|
||||
|
||||
@classmethod
|
||||
def get_invalid(cls, instance):
|
||||
|
|
@ -34,6 +34,12 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
|
|||
if not family_plugins_mapping:
|
||||
return
|
||||
|
||||
# Backward compatibility - settings did have 'product_types'
|
||||
if "product_types" in family_plugins_mapping:
|
||||
family_plugins_mapping["families"] = family_plugins_mapping.pop(
|
||||
"product_types"
|
||||
)
|
||||
|
||||
invalid = []
|
||||
# Find all plug-in requirements for current instance
|
||||
instance_families = {instance.data["family"]}
|
||||
|
|
@ -47,7 +53,9 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
|
|||
if not mapping:
|
||||
return
|
||||
|
||||
match_families = {fam.strip() for fam in mapping["families"]}
|
||||
match_families = {
|
||||
fam.strip() for fam in mapping["families"]
|
||||
}
|
||||
has_match = "*" in match_families or match_families.intersection(
|
||||
instance_families)
|
||||
|
||||
|
|
|
|||
|
|
@ -297,16 +297,6 @@ def _convert_3dsmax_project_settings(ayon_settings, output):
|
|||
return
|
||||
|
||||
ayon_max = ayon_settings["max"]
|
||||
_convert_host_imageio(ayon_max)
|
||||
# --- Publish (START) ---
|
||||
ayon_publish = ayon_max["publish"]
|
||||
|
||||
if "ValidateLoadedPlugin" in ayon_publish:
|
||||
loaded_plugin = (
|
||||
ayon_publish["ValidateLoadedPlugin"]["family_plugins_mapping"]
|
||||
)
|
||||
for item in loaded_plugin:
|
||||
item["families"] = item.pop("product_types")
|
||||
|
||||
output["max"] = ayon_max
|
||||
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@ class ValidateAttributesModel(BaseSettingsModel):
|
|||
|
||||
|
||||
class FamilyMappingItemModel(BaseSettingsModel):
|
||||
product_types: list[str] = SettingsField(
|
||||
families: list[str] = SettingsField(
|
||||
default_factory=list,
|
||||
title="Product Types"
|
||||
title="Families"
|
||||
)
|
||||
plugins: list[str] = SettingsField(
|
||||
default_factory=list,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue